Fix: Combat Tracker order is maintained