Fix CSV, close #984