Fixes #88