Fixes #457