diff --git a/glyphs/letters-unified-extended.ptl b/glyphs/letters-unified-extended.ptl
index 78744fadd..71ade47d8 100644
--- a/glyphs/letters-unified-extended.ptl
+++ b/glyphs/letters-unified-extended.ptl
@@ -1332,6 +1332,7 @@ export : define [apply] : begin
 	###########################################################################################
 	do
 		local ymiddle : [mix 0 CAP 0.5] - HALFSTROKE
+		local ymiddleCap : [mix 0 CAP 0.54] - HALFSTROKE
 		local xmiddle : RIGHTSB - ymiddle / 2 - STROKE * 0.75
 		local xfinal : Math.min (RIGHTSB - ymiddle / 2 - HALFSTROKE - 1 - STROKE * TANSLANT)
 			Math.max (SB + STROKE * 2) [mix SB RIGHTSB (1 / 4)]
@@ -1394,24 +1395,26 @@ export : define [apply] : begin
 
 		sketch # Eszet
 			include markset.capital
+			local rightTopX : RIGHTSB + O * 4
 			include : dispiro
 				widths.lhs
-				g4 (RIGHTSB + O * 2) (CAP - SMOOTHB)
-				hookstart (CAP - O)
+				flat rightTopX CAP
+				curl MIDDLE CAP
+				archv
 				flat SB XH
 				curl SB 0 [heading DOWNWARD]
 			include : dispiro
 				widths.rhs
-				g4   (RIGHTSB - ymiddle / 2 - STROKE * 0.75) (ymiddle + STROKE)
+				g4   (RIGHTSB - ymiddleCap / 2 - STROKE * 0.75) (ymiddleCap + STROKE)
 				archv
-				g4   (RIGHTSB - O) [mix 0 (ymiddle + STROKE) 0.5]
+				g4   (RIGHTSB - O * 2) [mix 0 (ymiddleCap + STROKE) 0.5]
 				arcvh
-				flat (RIGHTSB - ymiddle / 2 - HALFSTROKE) 0
+				flat (RIGHTSB - ymiddleCap / 2 - HALFSTROKE) 0
 				curl xfinal 0 [heading LEFTWARD]
 			include : dispiro
 				widths.rhs
-				g4 (RIGHTSB + O * 2) (CAP - SMOOTHB)
-				g4 (RIGHTSB - ymiddle / 2 - STROKE * 0.75) (ymiddle + STROKE) [widths STROKE 0]
+				g4 rightTopX (CAP - STROKE)
+				g4 (RIGHTSB - ymiddleCap / 2 - STROKE * 0.75) (ymiddleCap + STROKE) [widths STROKE 0]
 			if SLAB : include : LeftwardBottomSerif SB 0 SIDEJUT
 			save 'Eszet' 0x1E9E
 
diff --git a/support/autoref.js b/support/autoref.js
index b064561b7..64fb3e5c3 100644
--- a/support/autoref.js
+++ b/support/autoref.js
@@ -100,7 +100,11 @@ function autoref(glyf) {
 	// unlink composite
 	for (var j = 0; j < glyf.length; j++) {
 		if (!glyf[j].references || glyf[j].references.length === 0) continue;
-		if (glyf[j].contours.length === 0 && !(glyf[j].unicode && glyf[j].unicode[0] < 0x80))
+		if (
+			glyf[j].contours.length === 0 &&
+			!(glyf[j].unicode && glyf[j].unicode[0] < 0x80) &&
+			!(glyf[j].unicode && glyf[j].unicode[0] >= 0x2500 && glyf[j].unicode[0] <= 0x259f)
+		)
 			continue;
 
 		var cs = unlinkRef(glyf[j], 0, 0, glyf);