diff --git a/A320-main.xml b/A320-main.xml
index 15a9e050..20ba3a6d 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -1071,12 +1071,12 @@
 						if (getprop("/it-autoflight/output/athr") == 1) {
 							setprop("/it-autoflight/input/athr", 0);
 							libraries.athrOff("soft");
+							setprop("/ECAM/warnings/master-caution-light", 1);
 						} else {
 							if (getprop("/it-autoflight/output/athr-warning") == 1) {
 								setprop("/it-autoflight/output/athr-warning", 0);
+								setprop("/ECAM/warnings/master-caution-light", 0);
 							}
-							
-							setprop("/ECAM/warnings/master-caution-light", 1);
 						}
 					</script>
 				</binding>
diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index 13630066..8c6e760d 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -4055,7 +4055,10 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>libraries.apOff("hard","L");</script>
+				<script>if (getprop("/it-autoflight/output/ap1") == 0) {
+							libraries.apOff("hard","L");
+						}
+				</script>
 			</binding>
 		</action>
 	</animation>
@@ -4092,7 +4095,10 @@
 			</binding>
 			<binding>
 				<command>nasal</command>
-				<script>libraries.apOff("hard","R");</script>
+				<script>if (getprop("/it-autoflight/output/ap1") == 0) {
+							libraries.apOff("hard","R");
+						}
+				</script>
 			</binding>
 		</action>
 	</animation>
diff --git a/Nasal/FMGC-b.nas b/Nasal/FMGC-b.nas
index f0acc614..2e979d66 100644
--- a/Nasal/FMGC-b.nas
+++ b/Nasal/FMGC-b.nas
@@ -170,7 +170,7 @@ setlistener("/it-autoflight/input/athr", func {
 	var atmas = getprop("/it-autoflight/input/athr");
 	if (atmas == 0) {
 		setprop("/it-autoflight/output/athr", 0);
-		if (getprop("/it-autoflight/sound/enableathrsound") == 1 and getprop("/it-autoflight/output/athr-warning") == 1 and getprop("/it-autoflight/output/athr") == 0 and getprop("/position/gear-agl-ft") > 50) {
+		if (getprop("/it-autoflight/sound/enableathrsound") == 1 and getprop("/it-autoflight/output/athr") == 0 and getprop("/position/gear-agl-ft") > 50) {
 			setprop("/it-autoflight/sound/athrsound", 1);	
 			setprop("/it-autoflight/sound/enableathrsound", 0);	  
 		}
diff --git a/Nasal/buttons.nas b/Nasal/buttons.nas
index 75daece6..8519095e 100644
--- a/Nasal/buttons.nas
+++ b/Nasal/buttons.nas
@@ -253,7 +253,7 @@ var decreaseManVS = func {
 }
 
 var apOff = func(type, side) {
-	if ((side == "L" and getprop("/it-autoflight/input/ap1") == 1) or (side == "R" and getprop("/it-autoflight/input/ap2") == 1)) {
+	if ((side == "L" and getprop("/it-autoflight/output/ap1") == 1) or (side == "R" and getprop("/it-autoflight/output/ap2") == 1)) {
 		setprop("/it-autoflight/output/ap-warning", 0);
 		return;
 	}
@@ -269,7 +269,7 @@ var apOff = func(type, side) {
 }
 
 var athrOff = func(type) {
-	if (getprop("it-autoflight/input/athr") == 1) {
+	if (getprop("it-autoflight/output/athr") == 1) {
 		setprop("/it-autoflight/output/athr-warning", 0);
 		return;
 	}
diff --git a/Nasal/fadec-common.nas b/Nasal/fadec-common.nas
index f7c942e5..c78dbc7f 100644
--- a/Nasal/fadec-common.nas
+++ b/Nasal/fadec-common.nas
@@ -196,10 +196,10 @@ var atoff_request = func {
 	state1 = getprop("/systems/thrust/state1");
 	state2 = getprop("/systems/thrust/state2");
 	if ((state1 == "IDLE") and (state2 == "IDLE") and (getprop("/systems/thrust/alpha-floor") == 0) and (getprop("/systems/thrust/toga-lk") == 0)) {
-		setprop("/it-autoflight/input/athr", 0);
-		if (getprop("/it-autoflight/output/athr") == 0 and getprop("/position/gear-agl-ft") > 50) {
+		if (getprop("/it-autoflight/output/athr") == 1 and getprop("/position/gear-agl-ft") > 50) {
 			libraries.athrOff("soft");
 		}
+		setprop("/it-autoflight/input/athr", 0);
 	}
 }