Fixes #57, #58