Fixes #62