#54 fixes