Fixed .csv read/write