diff --git a/src/common/textsplit.cpp b/src/common/textsplit.cpp
index b239eb9e..beee33bb 100644
--- a/src/common/textsplit.cpp
+++ b/src/common/textsplit.cpp
@@ -517,8 +517,10 @@ bool TextSplit::text_to_words(const string &in)
 		    return false;
 		curspanglue = cc;
 		m_inNumber = false;
+		m_wordStart += it.appendchartostring(m_span);
+	    } else {
+		goto SPACE;
 	    }
-	    m_wordStart += it.appendchartostring(m_span);
 	    break;
 	case '_':
 	    if (m_wordLen) {