Fixing #457