fix #23338 (2nd try)