CRUNCH-429: Fix CSVInputFormat