Fix csv export issue