Fixes #97