diff --git a/AmiriQuran.ttf b/AmiriQuran.ttf
index eb2c45a7e0..cd4ee93584 100644
Binary files a/AmiriQuran.ttf and b/AmiriQuran.ttf differ
diff --git a/AmiriQuranColored.ttf b/AmiriQuranColored.ttf
index 79e50cc41d..c0058da552 100644
Binary files a/AmiriQuranColored.ttf and b/AmiriQuranColored.ttf differ
diff --git a/build.py b/build.py
index 7f927752f2..664468a7cd 100644
--- a/build.py
+++ b/build.py
@@ -420,7 +420,8 @@ def makeQuran(options):
 
     opts = subset.Options()
     opts.set(layout_features='*', name_IDs='*', name_languages='*',
-        notdef_outline=True, glyph_names=True, layout_scripts="*")
+        notdef_outline=True, glyph_names=True, layout_scripts="*",
+        recalc_average_width=True, recalc_max_context=True)
     subsetter = subset.Subsetter(options=opts)
     subsetter.populate(unicodes=unicodes)
     subsetter.subset(otf)