Fixes #107