fix #472 #1274

Job	Run time
canceller	4s
tests-Unix-CLI (ubuntu-20.04, 7, 3.8)	11m 55s
tests-Windows-CLI (mingw64, x86_64, 3.8)	22m 55s
tests-Unix-CLI (ubuntu-20.04, 11, 3.9)	13m 3s
tests-Unix-GUI (ubuntu-20.04, 5.9.5, 7)	5m 5s
tests-Windows-CLI (ucrt64, ucrt-x86_64, 3.8)	21m 2s
tests-Windows-GUI (mingw64, x86_64)	13m 1s
tests-Unix-CLI (macos-12, 3.8)	16m 41s
tests-Unix-GUI (ubuntu-20.04, 5.15.2, 11)	7m 21s
tests-Windows-GUI (ucrt64, ucrt-x86_64)	12m 43s
tests-Unix-CLI (macos-13, 3.9)	23m 3s
tests-Unix-GUI (ubuntu-22.04, 5.15.2, 12)	6m 28s
tests-windows-latest-pacman (mingw64, x86_64)	1m 54s
tests-Unix-GUI (ubuntu-22.04, 6.7.2, 12)	7m 2s
tests-windows-latest-pacman (ucrt64, ucrt-x86_64)	1m 56s
tests-Unix-GUI (macos-12, 5.9.5)	6m 9s
tests-Unix-GUI (macos-13, 5.15.2)	10m 14s
tests-Unix-GUI (macos-13, 6.7.2)	8m 3s
	3h 8m 39s

Provide feedback