diff --git a/af/lockandkey.af b/af/lockandkey.af
index ae7b90d..b2f1f2a 100644
--- a/af/lockandkey.af
+++ b/af/lockandkey.af
@@ -235,15 +235,15 @@ STATE: {service_bella_jaw_entry}
 				Chat {/vt opt set enablelooting false}
 				Chat {/vt opt set enablenav true}
 				Chat {/vt opt set enablebuffing false}
-				DoExpr {touchvar[jawEntryNavLoaded]}
+				DoExpr {setvar[jawEntryNavLoaded,1]}
 				Chat {/vt nav load nav_lockandkeyjaw}
 				SetWatchdog 3 600 {service_bella_backoff}
 	IF:	All
-			Expr {testvar[jawEntryNavLoaded]}
+			Expr {getvar[jawEntryNavLoaded]==1}
 			NavEmpty
 			SecsInStateGE 2
 		DO:	DoAll
-				DoExpr {clearvar[jawEntryNavLoaded]}
+				DoExpr {setvar[jawEntryNavLoaded,0]}
 				DoExpr {setvar[bellaJawRunRecoverAttempts, 0]}
 				Chat {/vt nav load jaw_1_hunt}
 				Chat {/vt opt set enablecombat true}
diff --git a/met/lockandkey.met b/met/lockandkey.met
index 29ffde7..3dceb9c 100644
--- a/met/lockandkey.met
+++ b/met/lockandkey.met
@@ -1757,7 +1757,7 @@ n
 s
 e
 s
-touchvar[jawEntryNavLoaded]
+setvar[jawEntryNavLoaded,1]
 i
 2
 s
@@ -1808,7 +1808,7 @@ n
 s
 e
 s
-testvar[jawEntryNavLoaded]
+getvar[jawEntryNavLoaded]==1
 i
 7
 i
@@ -1836,7 +1836,7 @@ n
 s
 e
 s
-clearvar[jawEntryNavLoaded]
+setvar[jawEntryNavLoaded,0]
 i
 7
 TABLE