diff --git a/src/main/resources/twilio-java/generate_uri.mustache b/src/main/resources/twilio-java/generate_uri.mustache
index 6ff4664d9..b74368824 100644
--- a/src/main/resources/twilio-java/generate_uri.mustache
+++ b/src/main/resources/twilio-java/generate_uri.mustache
@@ -11,11 +11,8 @@
         path = path.replace("{"+"{{baseName}}"+"}", this.{{paramName}}.toString());
     {{/vendorExtensions.x-is-account-sid}}
 {{/allParams}}
-{{#requiredParams}}
-    {{#vendorExtensions.x-is-phone-number-format}}
-        path = path.replace("{"+"{{baseName}}"+"}", this.{{paramName}}.encode("utf-8"));
-    {{/vendorExtensions.x-is-phone-number-format}}
-    {{^vendorExtensions.x-is-phone-number-format}}
-        path = path.replace("{"+"{{baseName}}"+"}", this.{{paramName}}.toString());
-    {{/vendorExtensions.x-is-phone-number-format}}
-{{/requiredParams}}
+{{#pathParams}}
+  {{^vendorExtensions.x-is-account-sid}}
+        path = path.replace("{"+"{{baseName}}"+"}", this.path{{baseName}}.toString());
+  {{/vendorExtensions.x-is-account-sid}}
+{{/pathParams}}