fix #21218 (again)