Fixes #234