fix #24426