diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Gandalf.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Gandalf.hjson
index 118134ced..92c715a54 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Gandalf.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Gandalf.hjson
@@ -608,8 +608,7 @@
 				type: Trigger
 				optional: false
 				trigger: {
-					type: played
-					filter: self
+					type: ConstantlyCheck
 				}
 				effect: {
 					type: discard
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set17/set17-gandalf-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set17/set17-gandalf-errata.hjson
index 904113529..36ef8f5ba 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set17/set17-gandalf-errata.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set17/set17-gandalf-errata.hjson
@@ -96,14 +96,12 @@
 			{
 				type: Trigger
 				optional: false
-				optional: false
 				trigger: {
-					type: Played
-					filter: self
+					type: ConstantlyCheck
 				}
 				effect: {
-					type: Discard
-					select: all(attachedTo(bearer),or(possession,weapon),another)
+					type: discard
+					select: all(other,possession,attachedTo(bearer))
 				}
 			}
 			{