Feature/cancel retry