diff --git a/Nasal/FMGC/FMGC-b.nas b/Nasal/FMGC/FMGC-b.nas
index be727e2c..1669b469 100644
--- a/Nasal/FMGC/FMGC-b.nas
+++ b/Nasal/FMGC/FMGC-b.nas
@@ -254,6 +254,10 @@ var ITAF = {
 		Internal.vsTemp = Internal.vs.getValue();
 		Position.indicatedAltitudeFtTemp = Position.indicatedAltitudeFt.getValue();
 		
+		# Update VLS / VMAX for autothrust
+		FMGCNodes.vmax.setValue(FMGCInternal.maxspeed);
+		FMGCNodes.vlsMin.setValue(FMGCInternal.vls_min);
+		
 		# LNAV Engagement
 		if (Output.lnavArm.getBoolValue()) {
 			me.checkLNAV(1);
diff --git a/Nasal/FMGC/FMGC.nas b/Nasal/FMGC/FMGC.nas
index ba7eca87..e986acaa 100644
--- a/Nasal/FMGC/FMGC.nas
+++ b/Nasal/FMGC/FMGC.nas
@@ -700,15 +700,12 @@ var masterFMGC = maketimer(0.2, func {
 	} else {
 		FMGCInternal.maxspeed = fmgc.FMGCInternal.vmo_mmo;
 	}
-	FMGCNodes.vmax.setValue(FMGCInternal.maxspeed);
 	
 	if (newphase != FMGCInternal.phase) {  # phase changed
 		FMGCInternal.phase = newphase;
 		FMGCNodes.phase.setValue(newphase);
 	}
 	
-
-
 	############################
 	# fuel
 	############################
@@ -940,7 +937,6 @@ var masterFMGC = maketimer(0.2, func {
 			FMGCInternal.vls_min = FMGCInternal.vs1g_conf_full * 1.23;
 		}
 	}
-	FMGCNodes.vlsMin.setValue(FMGCInternal.vls_min);
 	
 	if (gear0 and flap < 5 and (state1 == "MCT" or state1 == "MAN THR" or state1 == "TOGA") and (state2 == "MCT" or state2 == "MAN THR" or state2 == "TOGA")) {
 		if (!FMGCInternal.takeoffState) {