Cancel now works correctly