Fix for #560