[READY] [3.8] Fix csv generation mess