temporary fix for unit selection