fix #23341

hopefully better this time...