diff --git a/src/mathed/formula.C b/src/mathed/formula.C
index e0928cc642..c56e48fa4e 100644
--- a/src/mathed/formula.C
+++ b/src/mathed/formula.C
@@ -104,6 +104,7 @@ namespace {
 		MapleStream ms(os);
 		ms << ar;
 		string expr = os.str().c_str();
+		lyxerr << "ar: '" << ar << "'\n";
 
 		for (int i = 0; i < 100; ++i) { // at most 100 attempts
 			// try to fix missing '*' the hard way by using mint
@@ -527,12 +528,6 @@ InsetFormula::localDispatch(BufferView * bv, kb_action action,
 }
 
 
-bool needEqnArray(string const & extra)
-{
-	return extra == "dsolve";
-}
-
-
 void InsetFormula::handleExtern(const string & arg)
 {
 	// where are we?
@@ -549,11 +544,7 @@ void InsetFormula::handleExtern(const string & arg)
 	bool selected = mathcursor->selection();
 
 	MathArray ar;
-	if (needEqnArray(extra)) {
-		mathcursor->last();
-		//mathcursor->readLine(ar);
-		mathcursor->breakLine();
-	} else if (selected) {
+	if (selected) {
 		mathcursor->selGet(ar);
 		//lyxerr << "use selection: " << ar << "\n";
 	} else {
diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C
index 1f417f7529..b64b760272 100644
--- a/src/mathed/math_parser.C
+++ b/src/mathed/math_parser.C
@@ -795,7 +795,7 @@ void Parser::parse_into1(MathGridInset & grid, unsigned flags, bool numbered)
 		else if (t.cat() == catLetter)
 			add(*cell, t.character());
 
-		else if (t.cat() == catSpace) //&& code == LM_TC_TEXTRM
+		else if (t.cat() == catSpace && (flags & FLAG_TEXTMODE))
 			add(*cell, t.character());
 
 		else if (t.cat() == catParameter) {