diff --git a/character/hearth.js b/character/hearth.js
index db4a4ad47..ef1783107 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -1098,9 +1098,9 @@ character.hearth={
 					frequent:true,
 					usable:1,
 					filter:function(event){
-						return event.target.num('e',function(card){
+						return event.target.hasCard(function(card){
 							return !get.info(card).unique;
-						})>0;
+						},'e');
 					},
 					content:function(){
 						player.gain(game.createCard(trigger.target.getCards('e',function(card){
diff --git a/character/yxs.js b/character/yxs.js
index 70baba4df..b49e18563 100644
--- a/character/yxs.js
+++ b/character/yxs.js
@@ -2684,9 +2684,9 @@ character.yxs={
 			enable:'phaseUse',
 			usable:1,
 			filterTarget:function(card,player,target){
-				return player!=target&&target.num('e',function(card){
+				return player!=target&&target.hasCard(function(card){
 					return !get.info(card).unique;
-				});
+				},'e');
 			},
 			check:function(card){
 				return 6-ai.get.value(card);
diff --git a/mode/guozhan.js b/mode/guozhan.js
index c5e8fef48..ad02c9314 100644
--- a/mode/guozhan.js
+++ b/mode/guozhan.js
@@ -434,7 +434,7 @@ mode.guozhan={
 					if(ui.discardPile.childNodes[i].name=='taipingyaoshu') return true;
 				}
 				return game.hasPlayer(function(current){
-					return current!=player&&current.num('ej','taipingyaoshu');
+					return current!=player&&current.countCards('ej','taipingyaoshu');
 				});
 			},
 			content:function(){