#41 fixes