better fix #24492