diff --git a/card/gujian.js b/card/gujian.js
index 1945f58bd..eeebfa547 100644
--- a/card/gujian.js
+++ b/card/gujian.js
@@ -32,8 +32,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				global:'g_jinlianzhu',
 	            content:function(){
 	                var evt=event.getParent(3)._trigger;
-	                evt.untrigger();
-	                evt.finish();
+	                evt.cancel()
 	                if(evt.source){
 	                    evt.source.draw();
 	                }
diff --git a/card/sp.js b/card/sp.js
index 47ac6a4cc..864ad148e 100644
--- a/card/sp.js
+++ b/card/sp.js
@@ -14,8 +14,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					if(evt.jinchan){
 						var type=get.type(evt.card,'trick');
 						if(type=='basic'||type=='trick'){
-							evt.untrigger();
-			                evt.finish();
+							evt.cancel();
 						}
 					}
 					player.draw(2);
diff --git a/card/standard.js b/card/standard.js
index ee40a3c7b..29f3a6ed3 100644
--- a/card/standard.js
+++ b/card/standard.js
@@ -1713,12 +1713,12 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					if(event.list.length==0){
 						event.finish();
 						if(!event.state){
-							trigger.untrigger();
 							if(event.triggername=='phaseJudge'){
+								trigger.untrigger();
 								trigger.cancelled=true;
 							}
 							else{
-								trigger.finish();
+								trigger.cancel();
 							}
 						}
 					}
@@ -1822,12 +1822,12 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					}
 					else{
 						if(!event.state){
-							trigger.untrigger();
 							if(event.triggername=='phaseJudge'){
+								trigger.untrigger();
 								trigger.cancelled=true;
 							}
 							else{
-								trigger.finish();
+								trigger.cancel();
 							}
 						}
 					}
diff --git a/card/yunchou.js b/card/yunchou.js
index 2187e6f2c..f0977572c 100644
--- a/card/yunchou.js
+++ b/card/yunchou.js
@@ -418,8 +418,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						event.finish();
 						return;
 					}
-					info.evt.untrigger();
-					info.evt.finish();
+					info.evt.cancel();
 					event.source=info.source;
 					event.source.storage.youdishenru=player;
 					event.source.addSkill('youdishenru');
diff --git a/character/gwent.js b/character/gwent.js
index eec8170c8..15cf97b4b 100644
--- a/character/gwent.js
+++ b/character/gwent.js
@@ -2749,8 +2749,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				content:function(){
 					var evt=event.getParent(3)._trigger;
 					if(evt.gw_dudayuanshuai1){
-						evt.untrigger();
-		                evt.finish();
+						evt.cancel();
 					}
 					if(evt.cards){
 						player.gain(evt.cards,'gain2');
diff --git a/character/shenhua.js b/character/shenhua.js
index 0652fbd77..600329222 100644
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -1995,7 +1995,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     			}
     		},
             jiezi:{
-                trigger:{global:'phaseDrawSkipped'},
+                trigger:{global:['phaseDrawSkipped','phaseDrawCancelled']},
                 forced:true,
                 filter:function(event,player){
                     return event.player!=player;
diff --git a/game/game.js b/game/game.js
index e0918c0b2..e315f4f90 100644
--- a/game/game.js
+++ b/game/game.js
@@ -9599,7 +9599,7 @@
 					var name=event.card.viewAs||event.card.name;
 					if(event.cancelled&&!event.direct){
 						if(lib.card[name].cancel){
-							var next=game.createEvent(name+'Cancelled');
+							var next=game.createEvent(name+'Cancel');
 							next.setContent(lib.card[name].cancel);
 							next.card=event.card;
 							next.player=player;
@@ -25694,8 +25694,8 @@
 			}
 			else if(event.finished){
 				if(event._triggered==1){
-					if(event.type=='card') event.trigger('useCardToCancelled');
-					event.trigger(event.name+'Cancelled');
+					if(event.type=='card') event.trigger('useCardToOmitted');
+					event.trigger(event.name+'Omitted');
 					event._triggered=4;
 				}
 				else if(event._triggered==2){