try to fix export to csv
Merge remote-tracking branch 'origin/master'