Bug fix involving selection of new host