Fixes #110