diff --git a/Systems/fmgc-pitch.xml b/Systems/fmgc-pitch.xml
index ccb635a9..41afbbed 100644
--- a/Systems/fmgc-pitch.xml
+++ b/Systems/fmgc-pitch.xml
@@ -27,6 +27,7 @@
 	<logic>
 		<input>
 			<and>
+				<property>/it-autoflight/output/apfd-on</property>
 				<or>
 					<equals>
 						<property>/it-autoflight/output/vert</property>
@@ -37,7 +38,6 @@
 						<value>7</value>
 					</equals>
 				</or>
-				<property>/it-autoflight/output/apfd-on</property>
 			</and>
 		</input>
 		<output>/it-autoflight/internal/flch-active</output>
@@ -164,11 +164,11 @@
 	<logic>
 		<input>
 			<and>
+				<property>/it-autoflight/output/apfd-on</property>
 				<equals>
 					<property>/it-autoflight/output/vert</property>
 					<value>5</value>
 				</equals>
-				<property>/it-autoflight/output/apfd-on</property>
 			</and>
 		</input>
 		<output>/it-autoflight/internal/fpa-active</output>
@@ -455,6 +455,7 @@
 		<enable>
 			<condition>
 				<and>
+					<property>/it-autoflight/output/ap-on</property>
 					<equals>
 						<property>/gear/gear[1]/wow</property>
 						<value>0</value>
@@ -463,7 +464,6 @@
 						<property>/gear/gear[2]/wow</property>
 						<value>0</value>
 					</equals>
-					<property>/it-autoflight/output/ap-on</property>
 					<not-equals>
 						<property>/it-autoflight/output/vert</property>
 						<value>9</value>
@@ -602,6 +602,7 @@
 			<condition>
 				<not>
 					<and>
+						<property>/it-autoflight/output/ap-on</property>
 						<equals>
 							<property>/gear/gear[1]/wow</property>
 							<value>0</value>
@@ -610,7 +611,6 @@
 							<property>/gear/gear[2]/wow</property>
 							<value>0</value>
 						</equals>
-						<property>/it-autoflight/output/ap-on</property>
 						<not-equals>
 							<property>/it-autoflight/output/vert</property>
 							<value>9</value>
diff --git a/Systems/fmgc-roll-yaw.xml b/Systems/fmgc-roll-yaw.xml
index 187ddcc1..ae96fe29 100644
--- a/Systems/fmgc-roll-yaw.xml
+++ b/Systems/fmgc-roll-yaw.xml
@@ -21,6 +21,7 @@
 		<enable>
 			<condition>
 				<and>
+					<property>/it-autoflight/output/apfd-on</property>
 					<or>
 						<equals>
 							<property>/it-autoflight/output/lat</property>
@@ -31,7 +32,6 @@
 							<value>1</value>
 						</equals>
 					</or>
-					<property>/it-autoflight/output/apfd-on</property>
 				</and>
 			</condition>
 		</enable>
@@ -60,11 +60,11 @@
 		<enable>
 			<condition>
 				<and>
+					<property>/it-autoflight/output/apfd-on</property>
 					<equals>
 						<property>/it-autoflight/output/lat</property>
 						<value>2</value>
 					</equals>
-					<property>/it-autoflight/output/apfd-on</property>
 				</and>
 			</condition>
 		</enable>