Fix services not cancelling!