Fixes #101