fixed swapping of column names