fixes #58261072 with additional text tweaks