Fixing limited data export bug