Fix for #457