diff --git a/ChangeLog b/ChangeLog
index 7d957c5cf..3e8ccf4eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/normal/term.c (put_glyphs_terminal): Correct sign.
+	(print_backlog): set backlog_ucs4 and backlog_glyphs.
+	Reported by: Yves Blusseau.
+
 2010-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/normal/misc.c (grub_normal_print_device_info): Show
diff --git a/grub-core/normal/term.c b/grub-core/normal/term.c
index b55c0f06a..760900e86 100644
--- a/grub-core/normal/term.c
+++ b/grub-core/normal/term.c
@@ -657,7 +657,7 @@ put_glyphs_terminal (const struct grub_unicode_glyph *visual,
 	      >= (grub_ssize_t) grub_term_height (term) - 2)
 	    {
 	      state->backlog_glyphs = visual_ptr + 1;
-	      state->backlog_len = visual_len - (visual - visual_ptr) - 1;
+	      state->backlog_len = visual_len - (visual_ptr - visual) - 1;
 	      return 1;
 	    }
 
@@ -688,6 +688,7 @@ print_backlog (struct grub_term_output *term,
 	  grub_free (state->free);
 	  state->free = NULL;
 	  state->backlog_len = 0;
+	  state->backlog_ucs4 = 0;
 	}
       return ret;
     }
@@ -703,6 +704,7 @@ print_backlog (struct grub_term_output *term,
 	  grub_free (state->free);
 	  state->free = NULL;
 	  state->backlog_len = 0;
+	  state->backlog_glyphs = 0;
 	}
       return ret;
     }