Fixes #77