Fix for #2360