Fix for #4049