#153 fixes