fixes (#43, #49)