Stopping onyx export from causing duplicate completed events