diff --git a/src/ChangeLog b/src/ChangeLog
index 4dfb87a132..52f9a0da21 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-26  Dekel Tsur  <dekelts@tau.ac.il>
+
+	* text2.C (SetCurrentFont): Disable number property at boundary.
+
 2001-02-26  Juergen Vigna  <jug@sad.it>
 
 	* lyxfunc.C (getStatus): added a string argument override function so
diff --git a/src/text2.C b/src/text2.C
index 70b47c90a9..458ebe7616 100644
--- a/src/text2.C
+++ b/src/text2.C
@@ -2913,7 +2913,9 @@ void LyXText::SetCurrentFont(BufferView * bview) const
 		Language const * lang =
 			cursor.par()->getParLanguage(bview->buffer()->params);
 		current_font.setLanguage(lang);
+		current_font.setNumber(LyXFont::OFF);
 		real_current_font.setLanguage(lang);
+		real_current_font.setNumber(LyXFont::OFF);
 	}
 }