Fixes #58