Fixed new unit selection method