Fixes #74