fix #28931