#257 fixes