fixed cancel/cancelAll