diff --git a/src/fonts.js b/src/fonts.js
index 217f38e5c..7d02d1445 100644
--- a/src/fonts.js
+++ b/src/fonts.js
@@ -5941,13 +5941,13 @@ var CFFParser = (function CFFParserClosure() {
       if (pos == 0 || pos == 1) {
         predefined = true;
         format = pos;
-        var gid = 1;
         var baseEncoding = pos ? Encodings.ExpertEncoding :
                                  Encodings.StandardEncoding;
         for (var i = 0, ii = charset.length; i < ii; i++) {
           var index = baseEncoding.indexOf(charset[i]);
-          if (index != -1)
-            encoding[index] = gid++;
+          if (index != -1) {
+            encoding[index] = i;
+          }
         }
       } else {
         var dataStart = pos;
diff --git a/test/pdfs/issue2386.pdf.link b/test/pdfs/issue2386.pdf.link
new file mode 100644
index 000000000..75be8b1f0
--- /dev/null
+++ b/test/pdfs/issue2386.pdf.link
@@ -0,0 +1 @@
+http://www-support-downloads.sonymobile.com/st25/userguide_EN_ST25_1263-3851.1.pdf
diff --git a/test/test_manifest.json b/test/test_manifest.json
index e47701a60..0f19f3b22 100644
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@ -750,6 +750,14 @@
       "link": true,
       "type": "load"
     },
+    {  "id": "issue2386",
+      "file": "pdfs/issue2386.pdf",
+      "md5": "7dc787639aa6765214e9ff5494d231ed",
+      "rounds": 1,
+      "pageLimit": 2,
+      "link": true,
+      "type": "eq"
+    },
     {  "id": "issue2337",
       "file": "pdfs/issue2337.pdf",
       "md5": "ea10f4131202b9b8f2a6cb7770d3f185",