improve hints: fix #58118