Fixes #248