diff --git a/client/echo.c b/client/echo.c
index 7117da228385..1f1c57735baa 100644
--- a/client/echo.c
+++ b/client/echo.c
@@ -34,12 +34,9 @@
 int main(int argc, char **argv)
 {
   int i;
-  for (i= 1; i < argc; i++)
-  {
-    fprintf(stdout, "%s", argv[i]);
-    if (i < argc - 1)
-      fprintf(stdout, " ");
-  }
-  fprintf(stdout, "\n");
+  for (i= 1; i < argc-1; i++)
+    fprintf(stdout, "%s ", argv[i]);
+  
+  fprintf(stdout, "%s\n", argv[i]);
   return 0;
 }