Fix for #4649