diff --git a/.bzrignore b/.bzrignore
deleted file mode 100644
index 1fb3c24..0000000
--- a/.bzrignore
+++ /dev/null
@@ -1 +0,0 @@
-,*
diff --git a/.todo b/.todo
index fefa974..7b15329 100644
--- a/.todo
+++ b/.todo
@@ -1,29 +1,42 @@
-<todo version="0.1.19">
+<?xml version="1.0"?>
+<todo version="0.1.20">
     <note priority="medium" time="1187975642" done="1188304701">
         readme:iframe
         <comment>
             done in r23
         </comment>
     </note>
+    <note priority="medium" time="1187975645" done="1244350191">
+        readme:div
+        <comment>
+            will not be done
+        </comment>
+    </note>
+    <note priority="medium" time="1187975648" done="1244350198">
+        readme:pre
+        <comment>
+            will not be done
+        </comment>
+    </note>
     <note priority="medium" time="1187975662" done="1189593070">
         header:inline
     </note>
-    <note priority="medium" time="1187975645">
-        readme:div
-    </note>
-    <note priority="medium" time="1187975648">
-        readme:pre
-    </note>
     <note priority="medium" time="1187975708" done="1189593086">
         footer:inline
     </note>
+    <note priority="medium" time="1188484132" done="1244350207">
+        install handler *after* index handler
+        <comment>
+            done
+        </comment>
+    </note>
     <note priority="medium" time="1188384488">
         split big handler function into smaller pieces
     </note>
-    <note priority="medium" time="1188484132">
-        install handler *after* index handler
-    </note>
-    <note priority="medium" time="1189426947">
+    <note priority="medium" time="1189426947" done="1244350211">
         proper error message on subrequest errors
+        <comment>
+            done
+        </comment>
     </note>
 </todo>
diff --git a/ngx_http_fancyindex_module.c b/ngx_http_fancyindex_module.c
index 6352af0..27ca130 100644
--- a/ngx_http_fancyindex_module.c
+++ b/ngx_http_fancyindex_module.c
@@ -382,7 +382,8 @@ make_content_buf(
         entry->dir     = ngx_de_is_dir(&dir);
         entry->mtime   = ngx_de_mtime(&dir);
         entry->size    = ngx_de_size(&dir);
-        entry->utf_len = (r->utf8)
+        entry->utf_len = (r->headers_out.charset.len == 5 &&
+                ngx_strncasecmp(r->headers_out.charset.data, (u_char*) "utf-8", 5) == 0)
             ?  ngx_utf8_length(entry->name.data, entry->name.len)
             : len;
     }