Add back destroy fix unassign