diff --git a/Models/Instruments/PFD/PFD1.xml b/Models/Instruments/PFD/PFD1.xml
index 1729597f..c44256ea 100644
--- a/Models/Instruments/PFD/PFD1.xml
+++ b/Models/Instruments/PFD/PFD1.xml
@@ -2187,16 +2187,26 @@
 		<type>select</type>
 		<object-name>pitch-mode-armed-box</object-name>
 		<condition>
-			<or>
-				<equals>
-					<property>modes/pfd/fma/pitch-mode-armed-box</property>
-					<value>1</value>
-				</equals>
-				<equals>
-					<property>modes/pfd/fma/pitch-mode2-armed-box</property>
-					<value>1</value>
-				</equals>
-			</or>
+			<and>
+				<or>
+					<equals>
+						<property>modes/pfd/fma/pitch-mode-armed-box</property>
+						<value>1</value>
+					</equals>
+					<equals>
+						<property>modes/pfd/fma/pitch-mode2-armed-box</property>
+						<value>1</value>
+					</equals>
+				</or>
+				<not-equals>
+					<property>modes/pfd/fma/pitch-mode-armed</property>
+					<value> </value>
+				</not-equals>
+				<not-equals>
+					<property>modes/pfd/fma/pitch-mode2-armed</property>
+					<value> </value>
+				</not-equals>
+			</and>
 		</condition>
 	</animation>
 	
@@ -2215,10 +2225,16 @@
 		<type>select</type>
 		<object-name>roll-mode-armed-box</object-name>
 		<condition>
-			<equals>
-				<property>modes/pfd/fma/roll-mode-armed-box</property>
-				<value>1</value>
-			</equals>
+			<and>
+				<equals>
+					<property>modes/pfd/fma/roll-mode-armed-box</property>
+					<value>1</value>
+				</equals>
+				<not-equals>
+					<property>modes/pfd/fma/roll-mode-armed</property>
+					<value> </value>
+				</not-equals>
+			</and>
 		</condition>
 	</animation>
 	
diff --git a/Models/Instruments/PFD/PFD2.xml b/Models/Instruments/PFD/PFD2.xml
index d354e9bf..b097cb01 100644
--- a/Models/Instruments/PFD/PFD2.xml
+++ b/Models/Instruments/PFD/PFD2.xml
@@ -2187,16 +2187,26 @@
 		<type>select</type>
 		<object-name>pitch-mode-armed-box</object-name>
 		<condition>
-			<or>
-				<equals>
-					<property>modes/pfd/fma/pitch-mode-armed-box</property>
-					<value>1</value>
-				</equals>
-				<equals>
-					<property>modes/pfd/fma/pitch-mode2-armed-box</property>
-					<value>1</value>
-				</equals>
-			</or>
+			<and>
+				<or>
+					<equals>
+						<property>modes/pfd/fma/pitch-mode-armed-box</property>
+						<value>1</value>
+					</equals>
+					<equals>
+						<property>modes/pfd/fma/pitch-mode2-armed-box</property>
+						<value>1</value>
+					</equals>
+				</or>
+				<not-equals>
+					<property>modes/pfd/fma/pitch-mode-armed</property>
+					<value> </value>
+				</not-equals>
+				<not-equals>
+					<property>modes/pfd/fma/pitch-mode2-armed</property>
+					<value> </value>
+				</not-equals>
+			</and>
 		</condition>
 	</animation>
 	
@@ -2215,10 +2225,16 @@
 		<type>select</type>
 		<object-name>roll-mode-armed-box</object-name>
 		<condition>
-			<equals>
-				<property>modes/pfd/fma/roll-mode-armed-box</property>
-				<value>1</value>
-			</equals>
+			<and>
+				<equals>
+					<property>modes/pfd/fma/roll-mode-armed-box</property>
+					<value>1</value>
+				</equals>
+				<not-equals>
+					<property>modes/pfd/fma/roll-mode-armed</property>
+					<value> </value>
+				</not-equals>
+			</and>
 		</condition>
 	</animation>
 	
diff --git a/Nasal/FMGC-b.nas b/Nasal/FMGC-b.nas
index f3142043..b17cd5d7 100644
--- a/Nasal/FMGC-b.nas
+++ b/Nasal/FMGC-b.nas
@@ -308,6 +308,8 @@ var vertical = func {
 		setprop("/it-autoflight/mode/vert", "ALT HLD");
 		if (getprop("/it-autoflight/output/loc-armed")) {
 			setprop("/it-autoflight/mode/arm", "LOC");
+		} else if (getprop("/it-autoflight/input/lat-arm") == 1) {
+			setprop("/it-autoflight/mode/arm", "LNV");
 		} else {
 			setprop("/it-autoflight/mode/arm", " ");
 		}
@@ -328,6 +330,8 @@ var vertical = func {
 		setprop("/it-autoflight/mode/vert", "V/S");
 		if (getprop("/it-autoflight/output/loc-armed")) {
 			setprop("/it-autoflight/mode/arm", "LOC");
+		} else if (getprop("/it-autoflight/input/lat-arm") == 1) {
+			setprop("/it-autoflight/mode/arm", "LNV");
 		} else {
 			setprop("/it-autoflight/mode/arm", " ");
 		}
@@ -381,6 +385,8 @@ var vertical = func {
 		}
 		if (getprop("/it-autoflight/output/loc-armed")) {
 			setprop("/it-autoflight/mode/arm", "LOC");
+		} else if (getprop("/it-autoflight/input/lat-arm") == 1) {
+			setprop("/it-autoflight/mode/arm", "LNV");
 		} else {
 			setprop("/it-autoflight/mode/arm", " ");
 		}
@@ -397,8 +403,10 @@ var vertical = func {
 		setprop("/it-autoflight/input/fpa", fpanow);
 		setprop("/it-autoflight/output/vert", 5);
 		setprop("/it-autoflight/mode/vert", "FPA");
-		if (getprop("/it-autoflight/output/loc-armed") == 1) {
+		if (getprop("/it-autoflight/output/loc-armed")) {
 			setprop("/it-autoflight/mode/arm", "LOC");
+		} else if (getprop("/it-autoflight/input/lat-arm") == 1) {
+			setprop("/it-autoflight/mode/arm", "LNV");
 		} else {
 			setprop("/it-autoflight/mode/arm", " ");
 		}
@@ -438,6 +446,8 @@ var vertical = func {
 			setprop("/it-autoflight/internal/alt", altinput);
 			if (getprop("/it-autoflight/output/loc-armed")) {
 				setprop("/it-autoflight/mode/arm", "LOC");
+			} else if (getprop("/it-autoflight/input/lat-arm") == 1) {
+				setprop("/it-autoflight/mode/arm", "LNV");
 			} else {
 				setprop("/it-autoflight/mode/arm", " ");
 			}
@@ -458,6 +468,8 @@ var vertical = func {
 		setprop("/it-autoflight/mode/vert", " ");
 		if (getprop("/it-autoflight/output/loc-armed")) {
 			setprop("/it-autoflight/mode/arm", "LOC");
+		} else if (getprop("/it-autoflight/input/lat-arm") == 1) {
+			setprop("/it-autoflight/mode/arm", "LNV");
 		} else {
 			setprop("/it-autoflight/mode/arm", " ");
 		}
diff --git a/revision.txt b/revision.txt
index a57db8f5..927e0797 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-3040
\ No newline at end of file
+3041
\ No newline at end of file