Fixed csv parsing