diff --git a/Nasal/ECAM/ECAM-logic.nas b/Nasal/ECAM/ECAM-logic.nas
index 295b33f0..6821e5de 100644
--- a/Nasal/ECAM/ECAM-logic.nas
+++ b/Nasal/ECAM/ECAM-logic.nas
@@ -663,7 +663,7 @@ var messages_priority_3 = func {
 	if (gearNotDownLocked.clearFlag == 0 and warningNodes.Logic.gearNotDownLocked.getBoolValue() and phaseVar3 != 3 and phaseVar3 != 4 and phaseVar3 != 5 and phaseVar3 != 8) {
 		gearNotDownLocked.active = 1;
 		
-		if (gearNotDownLockedRec.clearFlag == 0 and !warningNodes.Logic.gearNotDownLockedFlipflop.getBoolValue()) {
+		if (gearNotDownLockedRec.clearFlag == 0 and warningNodes.Logic.gearNotDownLockedFlipflop.getValue() == 0) {
 			gearNotDownLockedRec.active = 1;
 			gearNotDownLockedWork.active = 1;
 		} else {
diff --git a/Systems/a320-fwc.xml b/Systems/a320-fwc.xml
index 7642360b..ccf85bd9 100644
--- a/Systems/a320-fwc.xml
+++ b/Systems/a320-fwc.xml
@@ -2328,11 +2328,7 @@
 			<test logic="AND" value="1">
 				/ECAM/warnings/fctl/gear-lever-down-pulse eq 1
 				/ECAM/warnings/fctl/gear-lever-down eq 1
-				<test logic="OR">
-					/gear/gear[0]/position-norm ne 1
-					/gear/gear[1]/position-norm ne 1
-					/gear/gear[2]/position-norm ne 1
-				</test>
+				/ECAM/warnings/fctl/gear-not-down-locked eq 1
 			</test>
 		</switch>