Index: uspace/lib/cpp/include/impl/iterator.hpp
===================================================================
--- uspace/lib/cpp/include/impl/iterator.hpp	(revision 2cf1da7eff995a5555a0cc73fa03fbf13436e55a)
+++ uspace/lib/cpp/include/impl/iterator.hpp	(revision fe3953059613a7ec22fee87de02f637f86ad7417)
@@ -819,15 +819,15 @@
             {
                 public:
+                    proxy_type(int_type c, streambuf_type* sbuf)
+                        : char_{c}, sbuf_{sbuf}
+                    { /* DUMMY BODY */ }
+
                     char_type operator*()
                     {
-                        return char_;
+                        return traits_type::to_char_type(char_);
                     }
 
                 private:
-                    proxy_type(char_type c, streambuf_type sbuf)
-                        : char_{c}, sbuf_{sbuf}
-                    { /* DUMMY BODY */ }
-
-                    char_type char_;
+                    int_type char_;
 
                     streambuf_type* sbuf_;
@@ -854,5 +854,5 @@
             { /* DUMMY BODY */ }
 
-            char_type operator*() const
+            char_type operator*() /* const */ // TODO: Should be const :/
             {
                 if (sbuf_)