Fixes #452