diff --git a/extra/io/streams/limited/limited-tests.factor b/extra/io/streams/limited/limited-tests.factor
index d160a3f756..eb5b921260 100644
--- a/extra/io/streams/limited/limited-tests.factor
+++ b/extra/io/streams/limited/limited-tests.factor
@@ -30,3 +30,11 @@ namespaces tools.test strings kernel ;
 [ "abc" CHAR: \n ] [ "\n" "limited" get stream-read-until [ >string ] dip ] unit-test
 
 [ "\n" "limited" get stream-read-until ] [ limit-exceeded? ] must-fail-with
+
+[ "he" CHAR: l ] [
+    B{ CHAR: h CHAR: e CHAR: l CHAR: l CHAR: o }
+    ascii <byte-reader> [
+        5 limit-input
+        "l" read-until
+    ] with-input-stream
+] unit-test
diff --git a/extra/io/streams/limited/limited.factor b/extra/io/streams/limited/limited.factor
index 669240d28b..e89b31a884 100644
--- a/extra/io/streams/limited/limited.factor
+++ b/extra/io/streams/limited/limited.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math io destructors accessors sequences
-namespaces ;
+USING: kernel math io io.encodings destructors accessors
+sequences namespaces ;
 IN: io.streams.limited
 
 TUPLE: limited-stream stream count limit ;
@@ -12,8 +12,13 @@ TUPLE: limited-stream stream count limit ;
         swap >>stream
         0 >>count ;
 
-: limit-input ( limit -- )
-    input-stream [ swap <limited-stream> ] change ;
+GENERIC# limit 1 ( stream limit -- stream' )
+
+M: decoder limit [ clone ] dip [ limit ] curry change-stream ;
+
+M: object limit <limited-stream> ;
+
+: limit-input ( limit -- ) input-stream [ swap limit ] change ;
 
 ERROR: limit-exceeded ;