Added a final fix to the export to make delete work