Fixed UnitBundle