Fixed Export to work with change to data variable