Fixes #241