Fix #28059 