FIX to UnitController