Fixes #461