diff --git a/Nasal/FMGC/FMGC-b.nas b/Nasal/FMGC/FMGC-b.nas
index 770e7981..8c3bd9de 100644
--- a/Nasal/FMGC/FMGC-b.nas
+++ b/Nasal/FMGC/FMGC-b.nas
@@ -291,14 +291,11 @@ var ITAF = {
 			if (Position.gearAglFtTemp <= 400 and Position.gearAglFtTemp >= 5) {
 				me.updateVertText("LAND");
 
-				if (Position.gearAglFtTemp <= 100) { # switch to internal flare logic at 100 feet -- but on FMA at 50!
+				if (Position.gearAglFtTemp <= 50) {
 					me.setVertMode(6);
 				}
 			}
 		} else if (Output.vertTemp == 6) {
-			if (Position.gearAglFtTemp <= 50 and Position.gearAglFtTemp >= 5 and Text.vert.getValue() != "FLARE") {
-				me.updateVertText("FLARE");
-			}
 			if (Gear.wow1Temp and Gear.wow2Temp and Text.vert.getValue() != "ROLLOUT") {
 				me.updateLatText("RLOU");
 				me.updateVertText("ROLLOUT");
@@ -671,6 +668,7 @@ var ITAF = {
 			me.updateApprArm(0);
 			Output.vert.setValue(6);
 			me.updateThrustMode();
+			me.updateVertText("FLARE");
 		} else if (n == 7) { # T/O CLB or G/A CLB, text is set by TOGA selector
 			Internal.flchActive = 0;
 			Internal.altCaptureActive = 0;
diff --git a/Systems/fmgc-drivers.xml b/Systems/fmgc-drivers.xml
index 4f74279f..4d66ecbb 100644
--- a/Systems/fmgc-drivers.xml
+++ b/Systems/fmgc-drivers.xml
@@ -588,6 +588,32 @@
 		<debug>false</debug>
 		<type>gain</type>
 		<gain>1.0</gain>
+		<input> <!-- Under 110ft glideslope data starts to become unusable -->
+			<condition>
+				<and>
+					<or>
+						<equals>
+							<property>/it-autoflight/output/vert</property>
+							<value>2</value>
+						</equals>
+						<equals>
+							<property>/it-autoflight/output/vert</property>
+							<value>6</value>
+						</equals>
+					</or>
+					<less-than-equals>
+						<property>/position/gear-agl-ft</property>
+						<value>110</value>
+					</less-than-equals>
+				</and>
+			</condition>
+			<expression>
+				<min>
+					<property>/it-autoflight/internal/nav-rate-of-climb-fpm</property>
+					<value>-500</value>
+				</min>
+			</expression>
+		</input>
 		<input>/instrumentation/nav[0]/gs-rate-of-climb-fpm</input>
 		<output>/it-autoflight/internal/nav-rate-of-climb-fpm</output>
 		<min>
diff --git a/Systems/fmgc-pitch.xml b/Systems/fmgc-pitch.xml
index 312191dd..c61e5dac 100644
--- a/Systems/fmgc-pitch.xml
+++ b/Systems/fmgc-pitch.xml
@@ -282,29 +282,31 @@
 		<gain>1.0</gain>
 		<input>
 			<expression>
-				<sum>
-					<difference> <!-- Fix an issue with the calculation -->
-						<property>/it-autoflight/internal/vert-speed-fpm</property>
+				<max>
+					<property>/it-autoflight/internal/nav-rate-of-climb-fpm</property>
+					<sum>
+						<difference> <!-- Fix an issue with the calculation -->
+							<property>/it-autoflight/internal/vert-speed-fpm</property>
+							<product>
+								<property>/velocities/vertical-speed-fps</property>
+								<value>60</value>
+							</product>
+						</difference>
 						<product>
-							<property>/velocities/vertical-speed-fps</property>
-							<value>60</value>
+							<sin>
+								<deg2rad>
+									<table>
+										<property>/position/gear-agl-ft</property>
+										<entry><ind>50</ind><dep>-3.0</dep></entry>
+										<entry><ind>45</ind><dep>-0.7</dep></entry>
+									</table>
+								</deg2rad>
+							</sin>
+							<property>/instrumentation/airspeed-indicator/true-speed-kt</property>
+							<value>101.26859142607174</value> <!-- FPM to Knot -->
 						</product>
-					</difference>
-					<product>
-						<sin>
-							<deg2rad>
-								<table>
-									<property>/position/gear-agl-ft</property>
-									<entry><ind>100</ind><dep>-2.80</dep></entry>
-									<entry><ind> 50</ind><dep>-2.12</dep></entry>
-									<entry><ind> 45</ind><dep>-0.61</dep></entry>
-								</table>
-							</deg2rad>
-						</sin>
-						<property>/instrumentation/airspeed-indicator/true-speed-kt</property>
-						<value>101.26859142607174</value> <!-- FPM to Knot -->
-					</product>
-				</sum>
+					</sum>
+				</max>
 			</expression>
 		</input>
 		<output>/it-autoflight/internal/target-fpm-land-fd</output>
@@ -318,32 +320,34 @@
 		<gain>1.0</gain>
 		<input>
 			<expression>
-				<sum>
-					<difference> <!-- Fix an issue with the calculation -->
-						<property>/it-autoflight/internal/vert-speed-fpm</property>
+				<max>
+					<property>/it-autoflight/internal/nav-rate-of-climb-fpm</property>
+					<sum>
+						<difference> <!-- Fix an issue with the calculation -->
+							<property>/it-autoflight/internal/vert-speed-fpm</property>
+							<product>
+								<property>/velocities/vertical-speed-fps</property>
+								<value>60</value>
+							</product>
+						</difference>
 						<product>
-							<property>/velocities/vertical-speed-fps</property>
-							<value>60</value>
+							<sin>
+								<deg2rad>
+									<table>
+										<property>/position/gear-agl-ft</property>
+										<entry><ind>50</ind><dep>-3.0</dep></entry>
+										<entry><ind>40</ind><dep>-1.8</dep></entry>
+										<entry><ind>30</ind><dep>-1.5</dep></entry>
+										<entry><ind>20</ind><dep>-1.2</dep></entry>
+										<entry><ind> 5</ind><dep>-0.7</dep></entry>
+									</table>
+								</deg2rad>
+							</sin>
+							<property>/instrumentation/airspeed-indicator/true-speed-kt</property>
+							<value>101.26859142607174</value> <!-- FPM to Knot -->
 						</product>
-					</difference>
-					<product>
-						<sin>
-							<deg2rad>
-								<table>
-									<property>/position/gear-agl-ft</property>
-									<entry><ind>100</ind><dep>-2.80</dep></entry>
-									<entry><ind> 50</ind><dep>-2.12</dep></entry>
-									<entry><ind> 40</ind><dep>-1.58</dep></entry>
-									<entry><ind> 30</ind><dep>-1.23</dep></entry>
-									<entry><ind> 20</ind><dep>-0.92</dep></entry>
-									<entry><ind> 10</ind><dep>-0.61</dep></entry>
-								</table>
-							</deg2rad>
-						</sin>
-						<property>/instrumentation/airspeed-indicator/true-speed-kt</property>
-						<value>101.26859142607174</value> <!-- FPM to Knot -->
-					</product>
-				</sum>
+					</sum>
+				</max>
 			</expression>
 		</input>
 		<output>/it-autoflight/internal/target-fpm-land</output>