diff --git a/modules/shell.cpp b/modules/shell.cpp
index e9dabcad..02f4513b 100644
--- a/modules/shell.cpp
+++ b/modules/shell.cpp
@@ -150,9 +150,7 @@ private:
 void CShellSock::ReadLine(const CString& sData) {
 	CString sLine = sData;
 
-	while (sLine.length() && (sLine[sLine.length() -1] == '\r' || sLine[sLine.length() -1] == '\n')) {
-		sLine = sLine.substr(0, sLine.length() -1);
-	}
+	sLine.TrimRight("\r\n");
 
 	CString::size_type a = sLine.find('\t');
 	while (a != CString::npos) {