fix #28471 (again)