diff --git a/legacy/evas/src/lib/engines/common/evas_font_ot_walk.x b/legacy/evas/src/lib/engines/common/evas_font_ot_walk.x
index 282dc3f807..496f830cdd 100644
--- a/legacy/evas/src/lib/engines/common/evas_font_ot_walk.x
+++ b/legacy/evas/src/lib/engines/common/evas_font_ot_walk.x
@@ -145,7 +145,6 @@
                } \
              prev_index = index; \
           } \
-        /* FIXME: clean up */ \
      } \
    while(0)
 
diff --git a/legacy/evas/src/lib/engines/common/evas_font_query.c b/legacy/evas/src/lib/engines/common/evas_font_query.c
index 758a154722..c513b9c9ae 100644
--- a/legacy/evas/src/lib/engines/common/evas_font_query.c
+++ b/legacy/evas/src/lib/engines/common/evas_font_query.c
@@ -300,7 +300,7 @@ evas_common_font_query_char_coords(RGBA_Font *fn, const Eina_Unicode *in_text, c
              if ((intl_props->bidi.dir == EVAS_BIDI_DIRECTION_LTR) &&
                    (EVAS_FONT_WALK_OT_POS <= (size_t) position) &&
                    ((((size_t) position) < EVAS_FONT_WALK_OT_POS_NEXT) ||
-                    (EVAS_FONT_WALK_OT_POS == EVAS_FONT_WALK_OT_POS_NEXT)))
+                    (EVAS_FONT_WALK_OT_IS_LAST)))
                {
                   found = 1;
                   items = EVAS_FONT_WALK_OT_POS_NEXT - EVAS_FONT_WALK_OT_POS;
@@ -315,7 +315,7 @@ evas_common_font_query_char_coords(RGBA_Font *fn, const Eina_Unicode *in_text, c
                }
              else if ((intl_props->bidi.dir == EVAS_BIDI_DIRECTION_RTL) &&
                    ((EVAS_FONT_WALK_OT_POS_PREV > (size_t) position) ||
-                    (EVAS_FONT_WALK_OT_POS == EVAS_FONT_WALK_OT_POS_PREV)) &&
+                    (EVAS_FONT_WALK_OT_IS_LAST)) &&
                    (((size_t) position) >= EVAS_FONT_WALK_OT_POS))
                {
                   found = 1;
@@ -440,7 +440,7 @@ evas_common_font_query_pen_coords(RGBA_Font *fn, const Eina_Unicode *in_text, co
              if ((intl_props->bidi.dir == EVAS_BIDI_DIRECTION_LTR) &&
                    (EVAS_FONT_WALK_OT_POS <= (size_t) position) &&
                    ((((size_t) position) < EVAS_FONT_WALK_OT_POS_NEXT) ||
-                    (EVAS_FONT_WALK_OT_POS == EVAS_FONT_WALK_OT_POS_NEXT)))
+                    (EVAS_FONT_WALK_OT_IS_LAST)))
                {
                   found = 1;
                   items = EVAS_FONT_WALK_OT_POS_NEXT - EVAS_FONT_WALK_OT_POS;
@@ -455,7 +455,7 @@ evas_common_font_query_pen_coords(RGBA_Font *fn, const Eina_Unicode *in_text, co
                }
              else if ((intl_props->bidi.dir == EVAS_BIDI_DIRECTION_RTL) &&
                    ((EVAS_FONT_WALK_OT_POS_PREV > (size_t) position) ||
-                    (EVAS_FONT_WALK_OT_POS == EVAS_FONT_WALK_OT_POS_PREV)) &&
+                    (EVAS_FONT_WALK_OT_IS_LAST)) &&
                    (((size_t) position) >= EVAS_FONT_WALK_OT_POS))
                {
                   found = 1;