Fixes #67