New data export fix