diff --git a/font-src/gen/caching/index.js b/font-src/gen/caching/index.js
index 484bb6b15..7891754a3 100644
--- a/font-src/gen/caching/index.js
+++ b/font-src/gen/caching/index.js
@@ -4,7 +4,7 @@ const fs = require("fs-extra");
 const zlib = require("zlib");
 const { encode, decode } = require("@msgpack/msgpack");
 
-const Edition = 6;
+const Edition = 7;
 const MAX_AGE = 5;
 
 class GfEntry {
diff --git a/font-src/gen/finalize/glyphs.js b/font-src/gen/finalize/glyphs.js
index 499df6705..bdc1dc9a3 100644
--- a/font-src/gen/finalize/glyphs.js
+++ b/font-src/gen/finalize/glyphs.js
@@ -67,8 +67,8 @@ function flattenSimpleGlyph(cache, skew, g) {
 		g.includeContours(CurveUtil.repToShape(cached), 0, 0);
 		cache.refreshGF(ck);
 	} else {
-		const tfBack = new Transform(1, -skew, 0, 1, 0, 0);
-		const tfForward = new Transform(1, +skew, 0, 1, 0, 0);
+		const tfBack = g.gizmo ? g.gizmo.inverse() : new Transform(1, -skew, 0, 1, 0, 0);
+		const tfForward = g.gizmo ? g.gizmo : new Transform(1, +skew, 0, 1, 0, 0);
 		const g1 = new Geom.TransformedGeometry(
 			new SimplifyGeometry(new Geom.TransformedGeometry(g.geometry, tfBack)),
 			tfForward
diff --git a/font-src/glyphs/auto-build/transformed.ptl b/font-src/glyphs/auto-build/transformed.ptl
index 0603cfb03..bc4857ed3 100644
--- a/font-src/glyphs/auto-build/transformed.ptl
+++ b/font-src/glyphs/auto-build/transformed.ptl
@@ -468,8 +468,10 @@ glyph-block Autobuild-Transformed-Mathematical : begin
 		local forked : Fork pendingGlyphs forkedPara
 		foreach {unicode glyphid} [items-of records] : if [not : query-glyph targetNameMap.(glyphid)]
 			create-glyph targetNameMap.(glyphid) unicode : glyph-proc
-				if [not : forked.queryByName glyphid] : console.log glyphid
-				include [forked.queryByName glyphid] AS_BASE ALSO_METRICS
+				define glyphT : forked.queryByName glyphid
+				if [not glyphT] : console.log glyphid
+				include glyphT AS_BASE ALSO_METRICS
+				set currentGlyph.gizmo glyphT.gizmo
 
 		link-relations relSets