Fixing issue with column names