diff --git a/card/extra.js b/card/extra.js
index 751f77aef..c5a56e367 100644
--- a/card/extra.js
+++ b/card/extra.js
@@ -442,8 +442,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					if(event.card.name=='sha'&&!event.card.nature) return true;
 				},
 				content:function(){
-					trigger.untrigger();
-					trigger.finish();
+					trigger.cancel();
 				},
 				ai:{
 					effect:{
diff --git a/card/guozhan.js b/card/guozhan.js
index 704da81e1..264b7539c 100644
--- a/card/guozhan.js
+++ b/card/guozhan.js
@@ -785,8 +785,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				},
 				forced:true,
 				content:function(){
-					trigger.untrigger();
-					trigger.finish();
+					trigger.cancel();
 				},
 				ai:{
 					nofire:true,
diff --git a/card/standard.js b/card/standard.js
index a7e0ca442..ee40a3c7b 100644
--- a/card/standard.js
+++ b/card/standard.js
@@ -1354,8 +1354,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					return (event.card.name=='sha'&&get.color(event.card)=='black')
 				},
 				content:function(){
-					trigger.untrigger();
-					trigger.finish();
+					trigger.cancel();
 				},
 				ai:{
 					effect:{
diff --git a/card/swd.js b/card/swd.js
index 87c210354..ba547569d 100644
--- a/card/swd.js
+++ b/card/swd.js
@@ -2189,8 +2189,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				forced:true,
 				content:function(){
 					'step 0'
-					trigger.untrigger();
-					trigger.finish();
+					trigger.cancel();
 					player.discard(player.getCards('he'));
 					player.removeSkill('huanpodan_skill');
 					'step 1'
@@ -3265,8 +3264,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					node.classList.add('thrownhighlight');
 					ui.arena.classList.add('thrownhighlight');
 					if(card){
-						trigger.untrigger();
-						trigger.finish();
+						trigger.cancel();
 						trigger.result={
 							card:card,
 							judge:trigger.judge(card),
@@ -3338,8 +3336,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					return player.maxHp>0;
 				},
 				content:function(){
-					trigger.untrigger();
-					trigger.finish();
+					trigger.cancel();
 					player.hp=1;
 					player.draw();
 					player.discard(player.getCards('e',{subtype:'equip5'}));
@@ -3441,8 +3438,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					return get.type(event.card,'trick')=='trick';
 				},
 				content:function(){
-					trigger.untrigger();
-					trigger.finish();
+					trigger.cancel();
 				},
 				ai:{
 					notrick:true,
@@ -4717,8 +4713,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					return event.nature=='thunder';
 				},
 				content:function(){
-					trigger.untrigger();
-					trigger.finish();
+					trigger.cancel();
 					player.recover(trigger.num);
 				},
 				ai:{