Fix: set was messing up column order