Fixes #245