Partially fixing bug #58145