Fixes #103