fixes #57 and #58"