Fixes #113