--- rxvt-unicode/src/rxvtfont.C	2010/03/31 21:52:05	1.160
+++ rxvt-unicode/src/rxvtfont.C	2010/03/31 22:22:32	1.161
@@ -1674,8 +1674,7 @@
       bool careful;
       if (f->has_char (unicode, &prop, careful))
         {
-          if (careful)
-            i |= 128;
+          i = (i << 1) | careful;
 
           goto found;
         }
@@ -1764,7 +1763,6 @@
 int
 rxvt_fontset::find_font (unicode_t unicode)
 {
-  int id = find_font_idx (unicode);
-
-  return min<int> (fontCount, id & 127) | (id & 128 ? Careful : 0);
+  return min<int> ((fontCount << 1) | 1, find_font_idx (unicode));
 }
+