More CSV export fix