Fixed #66538958