Fix issue with duplicate column names