diff --git a/lib/VMwareWebService/MiqVimDataStore.rb b/lib/VMwareWebService/MiqVimDataStore.rb
index 63e3868..fa98f0d 100644
--- a/lib/VMwareWebService/MiqVimDataStore.rb
+++ b/lib/VMwareWebService/MiqVimDataStore.rb
@@ -317,6 +317,6 @@ def encode_datastore_url(file_path, ds_name)
   end
 
   def encode_path_url(path)
-    URI::DEFAULT_PARSER.escape(path, /[^#{URI::PATTERN::UNRESERVED}]/o)
+    URI::RFC2396_Parser.escape(path, /[^#{URI::RFC2396_Parser::PATTERN::UNRESERVED}]/o)
   end
 end # module MiqVimDataStore