diff --git a/legacy/evas/ChangeLog b/legacy/evas/ChangeLog
index 825c84da89..99cf108f18 100644
--- a/legacy/evas/ChangeLog
+++ b/legacy/evas/ChangeLog
@@ -371,3 +371,8 @@
 	* Add evas_event_thaw_eval() for conveneince of evaluating in state
         and callbacks of the pointer after a thaw is complete.
 
+2011-05-29  Tom Hacohen (TAsn)
+
+	* Font-engine: Fixed a bug in glyph search causing inconsistent return
+	  values. The found fi should always be NULL if there was no fi found.
+
diff --git a/legacy/evas/src/lib/engines/common/evas_font_main.c b/legacy/evas/src/lib/engines/common/evas_font_main.c
index cf9cfb0010..a69c3cc153 100644
--- a/legacy/evas/src/lib/engines/common/evas_font_main.c
+++ b/legacy/evas/src/lib/engines/common/evas_font_main.c
@@ -534,5 +534,6 @@ evas_common_font_glyph_search(RGBA_Font *fn, RGBA_Font_Int **fi_ret, Eina_Unicod
                }
 	  }
      }
+   *fi_ret = NULL;
    return 0;
 }