Export working correctly now