Updated code to eliminate trap caused by bug introduced in 7.02.00 #3853

Job	Run time
build (ubuntu-22.04, 1, build, x86_64, linux-x86_64)	16m 4s
build (ubuntu-24.04, 2, build, x86_64, linux-x86_64)	17m 23s
build (self-hosted, linux, arm64, 3, build, aarch64, linux-aarch64)	16m 49s
build (ubuntu-22.04, 4, build, x86_64, linux-x86_64, yes)	20m 36s
build (self-hosted, linux, arm64, 5, build, aarch64, linux-aarch64, yes)	17m 41s
build (macos-13, 6, build, x86_64, darwin64-x86_64)	18m 46s
build (macos-14, 7, build, aarch64, darwin64-arm64)	21m 59s
build (macos-15, 8, build, aarch64, darwin64-arm64)	20m 27s
build (windows-2022, 9, build, Win64, VC-WIN64A)	22m 0s
build (ubuntu-24.04, test, 3.9, 10, x86_64)	12m 59s
build (ubuntu-24.04, test, 3.10, 11, x86_64)	12m 56s
build (ubuntu-24.04, test, 3.11, 12, x86_64)	17m 12s
build (ubuntu-24.04, test, 3.12, 13, x86_64)	7m 40s
merge	0s
publish	0s
	3h 42m 32s

Provide feedback