diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml
index f00a00e3..823e7ddc 100644
--- a/Systems/a320-fcs.xml
+++ b/Systems/a320-fcs.xml
@@ -207,9 +207,8 @@
 		
 		<switch name="fbw/roll/a-i-f">
 			<default value="/controls/flight/aileron"/>
-			<test logic="OR" value="0">
-				/it-autoflight/output/ap1 eq 1
-				/it-autoflight/output/ap2 eq 1
+			<test value="0">
+				fbw/fmgc/enabled eq 1
 			</test>
 		</switch>
 		
@@ -245,7 +244,6 @@
 		<switch name="fbw/roll/a-i-s">
 			<default value="0"/>
 			<test logic="AND" value="fbw/roll/aileron-nul">
-				position/wow eq 0
 				fbw/fmgc/enabled eq 0
 			</test>
 			<test logic="AND" value="fbw/fmgc/roll-cmd">
@@ -508,9 +506,11 @@
 					</table>
 					<table>
 						<independentVar lookup="row">velocities/mach</independentVar>
+						<independentVar lookup="column">position/wow</independentVar>
 						<tableData>
-							0.2  0.5
-							0.9  0.1
+							     0    1
+							0.2  0.5  1.0
+							0.9  0.1  1.0
 						</tableData>
 					</table>
 				</product>
@@ -556,9 +556,8 @@
 		
 		<switch name="fbw/pitch/e-i-f">
 			<default value="/controls/flight/elevator"/>
-			<test logic="OR" value="0">
-				/it-autoflight/output/ap1 eq 1
-				/it-autoflight/output/ap2 eq 1
+			<test value="0">
+				fbw/fmgc/enabled eq 1
 			</test>
 		</switch>
 		
diff --git a/revision.txt b/revision.txt
index fef2ed65..b27df586 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4405
\ No newline at end of file
+4406
\ No newline at end of file