diff --git a/gammu_receive_sms.sh b/gammu_receive_sms.sh
index 2706e1b..5205468 100644
--- a/gammu_receive_sms.sh
+++ b/gammu_receive_sms.sh
@@ -9,7 +9,7 @@ OTP=`oathtool -w 4 --now="$DATE" --totp -b  $SECRETKEY`
 
 OTPFROMCLIENT=`echo $SMS_1_TEXT | awk '{print $NF}'`
 CMD=`echo $SMS_1_TEXT | awk '{print tolower($1)}'`
-TEXT=`echo $SMS_1_TEXT | awk '{for (i=2; i<NF; i++) print $i}'`
+TEXT=`echo $SMS_1_TEXT | awk 'BEGIN {ORS=" "} {for (i=2; i<NF; i++) print $i}'`
 MATCH=`echo $OTP | grep $OTPFROMCLIENT`
 
 if [[ $SMS_1_NUMBER -eq $PHONENUM ]]; then
@@ -27,11 +27,11 @@ if [[ $SMS_1_NUMBER -eq $PHONENUM ]]; then
                                 ;;
                         cmd)
                                 HOST=`echo $TEXT | awk '{print $1}'`
-                                COMMAND=`echo $TEXT | awk 'BEGIN {ORS=" "} {for (i=2; i<NF; i++) print $i}'`
+                                COMMAND=`echo $TEXT | awk 'BEGIN {ORS=" "} {for (i=2; i<=NF; i++) print $i}'`
                                 REPLY=`ssh -oStrictHostKeyChecking=no root@$HOST $COMMAND`
                         pxy)
                                 PHONENUM=`echo $TEXT | awk '{print $1}'`
-                                REPLY=`echo $TEXT | awk 'BEGIN {ORS=" "} {for (i=2; i<NF; i++) print $i}'`
+                                REPLY=`echo $TEXT | awk 'BEGIN {ORS=" "} {for (i=2; i<=NF; i++) print $i}'`
                         		;;
                         *)
                                 REPLY="Commande inconnu"