Units holding weapons are handled better