diff --git a/lib/azure_blob/client.rb b/lib/azure_blob/client.rb
index 61be8bc..3f35c9a 100644
--- a/lib/azure_blob/client.rb
+++ b/lib/azure_blob/client.rb
@@ -246,7 +246,7 @@ def delete_container(options = {})
     #
     # Example: +generate_uri("#{container}/#{key}")+
     def generate_uri(path)
-      URI.parse(URI::DEFAULT_PARSER.escape(File.join(host, path)))
+      URI.parse(URI::RFC2396_PARSER.escape(File.join(host, path)))
     end
 
     # Returns an SAS signed URI