Fix for #2359