Fix for #2607