After some testing, fixing the csv support