Fixes #116