fix broken compile after andrew's changes