Fixed #81687 and #78731