Fix for #4938.