diff --git a/cube/User/Src/cmdHandler.c b/cube/User/Src/cmdHandler.c
index 7698aac..3656fdb 100644
--- a/cube/User/Src/cmdHandler.c
+++ b/cube/User/Src/cmdHandler.c
@@ -122,7 +122,12 @@ void cmdHandlerEngine(void *handle) {
                     resultRecv = recv(CMD_SOCK, receiveBuffer, sizeof(receiveBuffer));
                     coloredMsg(LOG_YELLOW, "che, recv returns 0x%02x", resultRecv);
                     if (resultRecv > 0) {
-                        if (receiveBuffer[strlen(receiveBuffer) - 1] == 0x0a) {
+                        if ((receiveBuffer[strlen(receiveBuffer) - 1] == 0x0a) ||
+                            (receiveBuffer[strlen(receiveBuffer) - 1] == 0x0d)) {
+                            receiveBuffer[strlen(receiveBuffer) - 1] = 0;
+                        }
+                        if ((receiveBuffer[strlen(receiveBuffer) - 1] == 0x0a) ||
+                            (receiveBuffer[strlen(receiveBuffer) - 1] == 0x0d)) {
                             receiveBuffer[strlen(receiveBuffer) - 1] = 0;
                         }
                         coloredMsg(LOG_YELLOW, "che, received: %s", receiveBuffer);