diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C
index 2436eda6a7..4c2f8fab3a 100644
--- a/src/mathed/formulabase.C
+++ b/src/mathed/formulabase.C
@@ -1,9 +1,8 @@
  /*
-*  File:        formula.C
-*  Purpose:     Implementation of formula inset
+*  File:        formulabase.C
+*  Purpose:     Implementation of common parts of the LyX  math insets
 *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
 *  Created:     January 1996
-*  Description: Allows the edition of math paragraphs inside Lyx.
 *
 *  Copyright: 1996-1998 Alejandro Aguilar Sierra
 *
@@ -692,8 +691,7 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
 		break;
 
 	default:
-		lyxerr << "Closed by action " << action << endl;
-		result = FINISHED_RIGHT;
+		result = UNDISPATCHED;
 	}
 
 	//mathcursor->normalize();
diff --git a/src/mathed/math_cursor.C b/src/mathed/math_cursor.C
index 8e70193a4d..12ec4a6ad2 100644
--- a/src/mathed/math_cursor.C
+++ b/src/mathed/math_cursor.C
@@ -1273,6 +1273,7 @@ void MathCursor::interpret(string const & s)
 
 	if (lastcode_ != LM_TC_TEX && strchr("#$%{}", c)) {
 		insert(new MathSpecialCharInset(c));	
+		lastcode_ = LM_TC_VAR;
 		return;
 	}
 
diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C
index 10f2c46b1a..a63b0b0fba 100644
--- a/src/mathed/math_parser.C
+++ b/src/mathed/math_parser.C
@@ -776,9 +776,6 @@ void Parser::parse_into(MathArray & array, unsigned flags, MathTextCodes code)
 			break; 
 		}
 
-		else  LM_TK_SPECIAL:
-			array.push_back(new MathCharInset(ival_, LM_TC_TEX));
-			break;
 */
 		
 		else if (t.cs() == "begin") {