--- rxvt-unicode/src/screen.C	2010/01/24 21:53:13	1.333
+++ rxvt-unicode/src/screen.C	2010/03/30 23:00:35	1.335
@@ -1836,7 +1836,7 @@
       min_it (rc[i].col, ncol - 1);
       min_it (rc[i].row, nrow - 1);
     }
-// TODO: this line somehow causes segfault if scr_expose() is called just after resize
+
   for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
     fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
 
@@ -2379,7 +2379,7 @@
           /*
            * Actually do the drawing of the string here
            */
-          rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
+          rxvt_font *font = fontset [GET_STYLE (rend)]->get (*text, GET_FONT (rend));
 
           if (expect_true (have_bg && back == Color_bg))
             {