1 files changed, 2 insertions, 2 deletions
diff --git a/lib/uri/common.rb b/lib/uri/common.rb
index 9a6a06894..827ed7883 100644
--- a/lib/uri/common.rb
+++ b/lib/uri/common.rb
@@ -223,11 +223,11 @@ module URI
           tmp << sprintf('%%%02X', uc)
         end
         tmp
-      end
+      end.force_encoding(Encoding::US_ASCII)
     end
 
     def unescape(str, escaped = @regexp[:ESCAPED])
-      str.gsub(escaped) { [$&[1, 2].hex].pack('U') }
+      str.gsub(escaped) { [$&[1, 2].hex].pack('C') }.force_encoding(str.encoding)
     end
 
     @@to_s = Kernel.instance_method(:to_s)