Fixed #7673