fixes #57, #58