Fix for #2560