Fixes #239