Added double checking of hosts