This fixed #7794.