More fixing for CSV