Fix my misguided refactorign wrt #27