Fixes #54