diff --git a/src/ChangeLog b/src/ChangeLog
index 1e86b887a5..5b00bc8787 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-09  Alfredo Braunstein  <abraunst@libero.it>
+
+	* text2.C (cursorRight): a getChar assert fixed 
+
 2003-04-09  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
 	* text2.C (getFont): change to take a ParagraphList::iterator
diff --git a/src/text2.C b/src/text2.C
index 8033501439..2ba74b7660 100644
--- a/src/text2.C
+++ b/src/text2.C
@@ -2055,10 +2055,13 @@ void LyXText::cursorLeft(bool internal)
 
 void LyXText::cursorRight(bool internal)
 {
-	if (!internal && cursor.boundary() &&
-	    !cursor.par()->isNewline(cursor.pos()))
+	bool const at_end = (cursor.pos() == cursor.par()->size());
+	bool const at_newline = !at_end &&
+		cursor.par()->isNewline(cursor.pos());
+
+	if (!internal && cursor.boundary() && !at_newline)
 		setCursor(cursor.par(), cursor.pos(), true, false);
-	else if (cursor.pos() < cursor.par()->size()) {
+	else if (!at_end) {
 		setCursor(cursor.par(), cursor.pos() + 1, true, false);
 		if (!internal &&
 		    isBoundary(bv()->buffer(), &*cursor.par(), cursor.pos()))