diff --git a/Systems/fmgc-roll-yaw.xml b/Systems/fmgc-roll-yaw.xml
index 1e5888a9..71b1e2b0 100644
--- a/Systems/fmgc-roll-yaw.xml
+++ b/Systems/fmgc-roll-yaw.xml
@@ -277,15 +277,6 @@
 		<type>noise-spike</type>
 		<feedback-if-disabled>true</feedback-if-disabled>
 		<initialize-to>output</initialize-to>
-		<input>
-			<condition>
-				<not-equals>
-					<property>/it-autoflight/output/lat</property>
-					<value>4</value>
-				</not-equals>
-			</condition>
-			<value>0</value>
-		</input>
 		<input>
 			<condition>
 				<equals>
@@ -295,6 +286,7 @@
 			</condition>
 			<property>/it-autoflight/internal/rudder-cmd</property>
 		</input>
+		<input>0</input>
 		<output>/fdm/jsbsim/fbw/fmgc/yaw-cmd</output> <!-- Inputs to the FBW Yaw -->
 		<max-rate-of-change>0.6</max-rate-of-change>
 	</filter>
diff --git a/Systems/fmgc-thrust.xml b/Systems/fmgc-thrust.xml
index 0c13a4c2..1b861561 100644
--- a/Systems/fmgc-thrust.xml
+++ b/Systems/fmgc-thrust.xml
@@ -21,14 +21,14 @@
 		<max-rate-of-change>
 			<condition>
 				<and>
-					<equals>
-						<property>/it-autoflight/output/thr-mode</property>
-						<value>0</value>
-					</equals>
 					<equals>
 						<property>/it-autoflight/output/athr</property>
 						<value>1</value>
 					</equals>
+					<equals>
+						<property>/it-autoflight/output/thr-mode</property>
+						<value>0</value>
+					</equals>
 					<equals>
 						<property>/it-autoflight/input/kts-mach</property>
 						<value>0</value>
@@ -59,14 +59,14 @@
 		<max-rate-of-change>
 			<condition>
 				<and>
-					<equals>
-						<property>/it-autoflight/output/thr-mode</property>
-						<value>0</value>
-					</equals>
 					<equals>
 						<property>/it-autoflight/output/athr</property>
 						<value>1</value>
 					</equals>
+					<equals>
+						<property>/it-autoflight/output/thr-mode</property>
+						<value>0</value>
+					</equals>
 					<equals>
 						<property>/it-autoflight/input/kts-mach</property>
 						<value>1</value>