Fixes #244