Finish fixing #7480