diff --git a/javascript/i18n/phonenumbers/phonenumbermatcher.js b/javascript/i18n/phonenumbers/phonenumbermatcher.js
index 9f0418d05..bc339d23e 100644
--- a/javascript/i18n/phonenumbers/phonenumbermatcher.js
+++ b/javascript/i18n/phonenumbers/phonenumbermatcher.js
@@ -218,7 +218,7 @@ var LEAD_CLASS; // built dynamically below
 function trimAfterFirstMatch(pattern, candidate) {
     var trailingCharsMatcher = pattern.exec(candidate);
     if (trailingCharsMatcher && trailingCharsMatcher.length) {
-        candidate = candidate.substring(0, trailingCharsMatcher[0].index);
+        candidate = candidate.substring(0, trailingCharsMatcher.index);
     }
     return candidate;
 }
diff --git a/javascript/i18n/phonenumbers/phonenumbermatcher_test.js b/javascript/i18n/phonenumbers/phonenumbermatcher_test.js
index b03b5e075..8a25676aa 100644
--- a/javascript/i18n/phonenumbers/phonenumbermatcher_test.js
+++ b/javascript/i18n/phonenumbers/phonenumbermatcher_test.js
@@ -54,7 +54,7 @@ function doTestFindInContext(number, defaultCountry) {
 function assertMatchProperties(match, text, number, region) {
   var expectedResult = phoneUtil.parse(number, region);
   assertNotNull("Did not find a number in '" + text + "'; expected " + number, match);
-  assertEquals(expectedResult, match.number);
+  assertTrue(expectedResult.equals(match.number));
   assertEquals(number, match.rawString);
 }