diff --git a/character/hearth.js b/character/hearth.js
index 9b89746eb..5563603d3 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -6837,7 +6837,7 @@ game.import("character", function () {
 				content() {
 					var num = (get.is.altered("guozai") ? 3 : 4) - player.countCards("h");
 					player.draw(num);
-					player.addTempSkill("guozai2", "phaseUseAfter");
+					player.addSkill("guozai2");
 					player.storage.guozai2 += num;
 					game.addVideo("storage", player, ["guozai2", player.storage.guozai2]);
 				},
@@ -6858,6 +6858,7 @@ game.import("character", function () {
 				content() {
 					player.chooseToDiscard("he", true, player.storage.guozai2);
 					player.storage.guozai2 = 0;
+					player.removeSkill("guozai2");
 				},
 			},
 			guozaix: {
@@ -6872,7 +6873,7 @@ game.import("character", function () {
 				content() {
 					var num = 4 - player.countCards("h");
 					player.draw(num);
-					player.addTempSkill("guozaix2", "phaseUseAfter");
+					player.addSkill("guozaix2");
 					player.storage.guozaix2 += num;
 					game.addVideo("storage", player, ["guozaix2", player.storage.guozaix2]);
 				},
@@ -6893,6 +6894,7 @@ game.import("character", function () {
 				content() {
 					player.chooseToDiscard("he", true, player.storage.guozaix2);
 					player.storage.guozaix2 = 0;
+					player.removeSkill("guozaix2");
 				},
 			},
 			hanshuang: {
diff --git a/character/yijiang/skill.js b/character/yijiang/skill.js
index 5ddfcc4e3..9454cef17 100644
--- a/character/yijiang/skill.js
+++ b/character/yijiang/skill.js
@@ -14447,7 +14447,8 @@ const skills = {
 			aiOrder: function (player, card, num) {
 				if (typeof card == "object" && player.isPhaseUsing()) {
 					var evt = player.getLastUsed();
-					if (evt && evt.card && ((get.suit(evt.card) && get.suit(evt.card) == get.suit(card)) || (evt.card.number && evt.card.number == get.number(card)))) {
+					if (!evt || !evt.card || evt.getParent("phaseUse") !== _status.event.getParent("phaseUse")) return num;
+					if ((get.suit(evt.card) && get.suit(evt.card) == get.suit(card)) || (evt.card.number && evt.card.number == get.number(card))) {
 						return num + 10;
 					}
 				}
@@ -14460,7 +14461,7 @@ const skills = {
 			if (!evt || !evt.card) return false;
 			if (!player.isPhaseUsing()) return false;
 			var evt2 = evt.getParent("phaseUse");
-			if (!evt2 || evt2.name != "phaseUse" || evt2.player != player) return false;
+			if (!evt2 || evt2.name != "phaseUse" || evt2 !== event.getParent("phaseUse")) return false;
 			return (get.suit(evt.card) != "none" && get.suit(evt.card) == get.suit(event.card)) || (typeof get.number(evt.card, false) == "number" && get.number(evt.card, false) == get.number(event.card));
 		},
 		content: function () {