Fix for #963