[x] Fixing cancel
Merge commit 'a51fad8d9e02f2947cfb0fb9e18ababfeaf63169'