Fix for issue #95 #284

Job	Run time
test (1.6, ubuntu-latest, x86)	2m 28s
test (1.6, ubuntu-latest, x64)	2m 6s
test (1.6, macOS-latest, x64)	2m 52s
test (1.6, windows-latest, x86)	13m 27s
test (1.6, windows-latest, x64)	12m 40s
test (1, ubuntu-latest, x86)	2m 42s
test (1, ubuntu-latest, x64)	2m 13s
test (1, macOS-latest, x64)	2m 36s
test (1, windows-latest, x86)	4m 31s
test (1, windows-latest, x64)	3m 13s
test (nightly, ubuntu-latest, x86)	3m 3s
test (nightly, ubuntu-latest, x64)	2m 37s
test (nightly, macOS-latest, x64)	3m 48s
test (nightly, windows-latest, x86)	4m 13s
test (nightly, windows-latest, x64)	3m 20s
	1h 5m 49s

Provide feedback