diff --git a/IPython/ipmaker.py b/IPython/ipmaker.py
index 0dd7a34..f12f01b 100644
--- a/IPython/ipmaker.py
+++ b/IPython/ipmaker.py
@@ -6,7 +6,7 @@ Requires Python 2.1 or better.
 
 This file contains the main make_IPython() starter function.
 
-$Id: ipmaker.py 1329 2006-05-26 07:52:45Z fperez $"""
+$Id: ipmaker.py 1330 2006-05-26 22:34:48Z fperez $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu>
@@ -331,11 +331,6 @@ object? -> Details about 'object'. ?object also works, ?? prints more.
     mutex_opts(opts,[qw('log logfile'),qw('rcfile profile'),
                      qw('classic profile'),qw('classic rcfile')])
 
-    # Fix up sys.argv to omit the ipython call, for consistency with how
-    # Python itself operates (the inconsistency can break user scripts which
-    # rely on the Python behavior when run under ipython).
-    sys.argv[:] = sys.argv[1:]
-
     #---------------------------------------------------------------------------
     # Log replay
     
@@ -702,19 +697,20 @@ object? -> Details about 'object'. ?object also works, ?? prints more.
         # directly. This prevents triggering the IPython crash handler.
         old_excepthook,sys.excepthook = sys.excepthook, IP.excepthook
 
-        save_argv = sys.argv[:] # save it for later restoring
+        save_argv = sys.argv[1:] # save it for later restoring
         
         sys.argv = args
-
+        
         try:
             IP.safe_execfile(args[0], IP.user_ns)
         finally:
             # Reset our crash handler in place
             sys.excepthook = old_excepthook
-            sys.argv = save_argv
+            sys.argv[:] = save_argv
             IP.user_ns['__name__'] = name_save
         
     msg.user_exec.release_all()
+
     if IP_rc.messages:
         msg.summary += msg.user_exec.summary_all()