diff --git a/api/graphics2_win.C b/api/graphics2_win.C
index 4767251031..475b3de631 100755
--- a/api/graphics2_win.C
+++ b/api/graphics2_win.C
@@ -348,7 +348,7 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR Args, int WinMode
     int argc;
 
     command_line = GetCommandLine();
-    argc = parse_command_line( command_line, argv );
+    argc = parse_command_line(command_line, argv);
     main(argc, argv);
 }
 
diff --git a/checkin_notes b/checkin_notes
index 598208ff65..06942818f7 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -7947,3 +7947,12 @@ Charlie 16 Aug 2007
     clientgui/
         res/
             BOINCMgr.icns
+
+David  16 Aug 2007
+	- screensaver fix
+
+	api/
+		graphics2_win.C
+	lib/
+		util.C
+
diff --git a/lib/util.C b/lib/util.C
index d0d73c8159..f0e43b7e5e 100755
--- a/lib/util.C
+++ b/lib/util.C
@@ -316,9 +316,11 @@ int run_program(
     memset(&startup_info, 0, sizeof(startup_info));
              
     strcpy(cmdline, "");
-    for (int i=1; i<argc; i++) {
+    for (int i=0; i<argc; i++) {
         strcat(cmdline, argv[i]);
-        strcat(cmdline, " ");
+        if (i<argc-1) {
+            strcat(cmdline, " ");
+        }
     }
 
     retval = CreateProcess(