diff --git a/java/com/android/vcard/VCardEntry.java b/java/com/android/vcard/VCardEntry.java
index 44a71d8..97b1bfc 100644
--- a/java/com/android/vcard/VCardEntry.java
+++ b/java/com/android/vcard/VCardEntry.java
@@ -1789,7 +1789,7 @@
                 } else if (ch == 'w' || ch == 'W') {
                     builder.append(PhoneNumberUtils.WAIT);
                     hasPauseOrWait = true;
-                } else if (('0' <= ch && ch <= '9') || (i == 0 && ch == '+')) {
+                } else if (PhoneNumberUtils.is12Key(ch) || (i == 0 && ch == '+')) {
                     builder.append(ch);
                 }
             }
diff --git a/tests/res/raw/v21_complicated.vcf b/tests/res/raw/v21_complicated.vcf
index de34e16..b40ebea 100644
--- a/tests/res/raw/v21_complicated.vcf
+++ b/tests/res/raw/v21_complicated.vcf
@@ -8,6 +8,7 @@
 TITLE:Shrimp Man
 TEL;WORK;VOICE:(111) 555-1212
 TEL;HOME;VOICE:(404) 555-1212
+TEL;FAX:(404) 555-1212P*#55
 TEL;CELL:0311111111
 TEL;VIDEO:0322222222
 TEL;VOICE:0333333333
@@ -103,4 +104,4 @@
 GEO:35.6563854,139.6994233
 URL:http://www.example.com/
 REV:20080424T195243Z
-END:VCARD
\ No newline at end of file
+END:VCARD
diff --git a/tests/res/raw/v30_complicated.vcf b/tests/res/raw/v30_complicated.vcf
index 4a8698e..0443a6f 100644
--- a/tests/res/raw/v30_complicated.vcf
+++ b/tests/res/raw/v30_complicated.vcf
@@ -8,6 +8,7 @@
 TITLE:Shrimp Man
 TEL;WORK;VOICE:(111) 555-1212
 TEL;HOME;VOICE:(404) 555-1212
+TEL;FAX:(404) 555-1212P*#55
 TEL;CELL:0311111111
 TEL;VIDEO:0322222222
 TEL;VOICE:0333333333
diff --git a/tests/src/com/android/vcard/tests/VCardImporterTests.java b/tests/src/com/android/vcard/tests/VCardImporterTests.java
index 134014f..7b4e669 100644
--- a/tests/src/com/android/vcard/tests/VCardImporterTests.java
+++ b/tests/src/com/android/vcard/tests/VCardImporterTests.java
@@ -573,6 +573,7 @@
                 .addExpectedNodeWithOrder("X-CLASS", "PUBLIC")
                 .addExpectedNodeWithOrder("TEL", "(111) 555-1212", new TypeSet("WORK", "VOICE"))
                 .addExpectedNodeWithOrder("TEL", "(404) 555-1212", new TypeSet("HOME", "VOICE"))
+                .addExpectedNodeWithOrder("TEL", "(404) 555-1212P*#55", new TypeSet("FAX"))
                 .addExpectedNodeWithOrder("TEL", "0311111111", new TypeSet("CELL"))
                 .addExpectedNodeWithOrder("TEL", "0322222222", new TypeSet("VIDEO"))
                 .addExpectedNodeWithOrder("TEL", "0333333333", new TypeSet("VOICE"))
@@ -645,6 +646,9 @@
                 .put(Phone.TYPE, Phone.TYPE_HOME)
                 .put(Phone.NUMBER, "404-555-1212");
         elem.addExpected(Phone.CONTENT_ITEM_TYPE)
+                .put(Phone.TYPE, Phone.TYPE_FAX_HOME)
+                .put(Phone.NUMBER, "4045551212,*#55");
+        elem.addExpected(Phone.CONTENT_ITEM_TYPE)
                 .put(Phone.TYPE, Phone.TYPE_MOBILE)
                 .put(Phone.NUMBER, "031-111-1111");
         elem.addExpected(Phone.CONTENT_ITEM_TYPE)