Fixes #86