diff --git a/glyphs/common-shapes.patel b/glyphs/common-shapes.patel
index f0d2967..0ec9abe 100644
--- a/glyphs/common-shapes.patel
+++ b/glyphs/common-shapes.patel
@@ -475,7 +475,7 @@ define [HookShape toStraight toFinish isStart y tight s kkaf] : begin
 	local u : Math.abs (toFinish.x - toStraight.x)
 	local mixr : determineMixR w v
 	local mx ([mix toStraight.x toFinish.x mixr] + ([if tight 0 : if atBottom 1 (-1)] * CORRECTION_OMIDX) * [fallback s STROKE])
-	local keyKnot : g4.[if ltr "right" "left"].mid mx y [if tight [heading [if ltr RIGHTWARD LEFTWARD]] kkaf]
+	local keyKnot : g4.[if ltr "right" "left"].mid mx y [fallback kkaf : if tight [heading [if ltr RIGHTWARD LEFTWARD]] nothing]
 	
 	local segBefore {}
 	local segAfter {}
diff --git a/glyphs/letters-unified-basic.patel b/glyphs/letters-unified-basic.patel
index f451e16..3c7d80f 100644
--- a/glyphs/letters-unified-basic.patel
+++ b/glyphs/letters-unified-basic.patel
@@ -296,13 +296,12 @@ symbol-block 'X'
 			local p 0.85
 			local fine : STROKE * 0.8
 			include : dispiro
-				widths.rhs
-				g4 (SB + O * 3) (XH - HOOK)
-				hookstart (XH - O)
+				g4 (SB + O * 3) (XH - HOOK) [widths.rhs MVERTSTROKE]
+				hookstart (XH - O) true nothing [widths.heading 0 STROKE RIGHTWARD]
 				flat (MIDDLE + (fine - HALFSTROKE) * CORRECTION_HX) (XH - SMALLSMOOTH * p) [widths.heading 0 fine DOWNWARD]
 				curl (MIDDLE + (fine - HALFSTROKE) * CORRECTION_HX) (0  + SMALLSMOOTH * p) [heading DOWNWARD]
-				hookend O false nothing [widths.rhs]
-				g4 (SB + O * 3) HOOK
+				hookend O true nothing [widths.heading 0 STROKE LEFTWARD]
+				g4 (SB + O * 3) HOOK [widths.rhs MVERTSTROKE]
 
 		include eMarks
 		include g