diff --git a/Amiri-Bold.otf b/Amiri-Bold.otf
index a2dad6b13e..58b570a96d 100644
Binary files a/Amiri-Bold.otf and b/Amiri-Bold.otf differ
diff --git a/Amiri-BoldSlanted.otf b/Amiri-BoldSlanted.otf
index 7d422f6808..acb024a229 100644
Binary files a/Amiri-BoldSlanted.otf and b/Amiri-BoldSlanted.otf differ
diff --git a/Amiri-Regular.otf b/Amiri-Regular.otf
index ec8a62721a..99e1b73d6e 100644
Binary files a/Amiri-Regular.otf and b/Amiri-Regular.otf differ
diff --git a/Amiri-Slanted.otf b/Amiri-Slanted.otf
index a1b670c08a..4cd3dd0aa3 100644
Binary files a/Amiri-Slanted.otf and b/Amiri-Slanted.otf differ
diff --git a/AmiriQuran.otf b/AmiriQuran.otf
index 99bf2ba427..e40f7f7c3e 100644
Binary files a/AmiriQuran.otf and b/AmiriQuran.otf differ
diff --git a/AmiriQuranColored.otf b/AmiriQuranColored.otf
index 13d5400193..6a63c106b6 100644
Binary files a/AmiriQuranColored.otf and b/AmiriQuranColored.otf differ
diff --git a/sources/quran.fea b/sources/quran.fea
index 68aa400b74..317d710e9d 100644
--- a/sources/quran.fea
+++ b/sources/quran.fea
@@ -12,7 +12,7 @@
 
 # Substitute combining small letters by the spacing ones.
 feature ccmp {
-  sub uni00A0'   uni0670' by uni0670.isol;
+  sub [uni00A0 uni202F]' uni0670' by uni0670.isol;
   sub @aKashida' uni0670' by uni0670.medi;
   sub @aKashida' uni06E7' by uni06E7.medi;
   sub @aKashida' uni08F3' by uni08F3.medi;