Fixes #100