Fixing swapped columns