diff --git a/src/fonts.js b/src/fonts.js
index 672739ea4..cc24f30c9 100644
--- a/src/fonts.js
+++ b/src/fonts.js
@@ -765,8 +765,10 @@ var Font = (function Font() {
 
     this.fontMatrix = properties.fontMatrix;
     this.widthMultiplier = 1.0;
-    if (properties.type == 'Type3')
+    if (properties.type == 'Type3') {
+      this.encoding = properties.baseEncoding;
       return;
+    }
 
     // Trying to fix encoding using glyph CIDSystemInfo.
     this.loadCidToUnicode(properties);
@@ -2152,7 +2154,7 @@ var Font = (function Font() {
       };
     },
 
-    charsToGlyphs: function fonts_chars2Glyphs(chars) {
+    charsToGlyphs: function fonts_charsToGlyphs(chars) {
       var charsCache = this.charsCache;
       var glyphs;
 
diff --git a/test/driver.js b/test/driver.js
index ffaf0b53a..83f80ebed 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -167,7 +167,8 @@ function nextPage(task, loadError) {
           if (error)
             failureMessage = 'render : ' + error.message;
           snapshotCurrentPage(task, failureMessage);
-        }
+        },
+        true
       );
     } catch (e) {
       failure = 'page setup : ' + e.toString();