fix #21218