Fixes #237