Bug fix for running on large numbers of hosts
Stupid access violations...