Fix for issue #95 #282

Job	Run time
test (1.6, ubuntu-latest, x86)	2m 39s
test (1.6, ubuntu-latest, x64)	2m 11s
test (1.6, macOS-latest, x64)	2m 29s
test (1.6, windows-latest, x86)	14m 5s
test (1.6, windows-latest, x64)	13m 36s
test (1, ubuntu-latest, x86)	2m 47s
test (1, ubuntu-latest, x64)	2m 20s
test (1, macOS-latest, x64)	3m 12s
test (1, windows-latest, x86)	4m 36s
test (1, windows-latest, x64)	2m 53s
test (nightly, ubuntu-latest, x86)	3m 25s
test (nightly, ubuntu-latest, x64)	2m 41s
test (nightly, macOS-latest, x64)	4m 2s
test (nightly, windows-latest, x86)	4m 36s
test (nightly, windows-latest, x64)	3m 29s
	1h 9m 1s

Provide feedback