Fixed cancel and restart antecedent and dependent bugs