1 files changed, 2 insertions, 1 deletions
diff --git a/ruby.c b/ruby.c
index 7d11ab129a..55bef5d534 100644
--- a/ruby.c
+++ b/ruby.c
@@ -430,7 +430,7 @@ proc_options(argc, argv)
 	    goto reswitch;
 
 	  case 'v':
-	    if (verbose) {
+	    if (argv0 == 0 || verbose) {
 		s++;
 		goto reswitch;
 	    }
@@ -990,6 +990,7 @@ ruby_set_argv(argc, argv)
     if (origargv) dln_argv0 = origargv[0];
     else          dln_argv0 = argv[0];
 #endif
+    rb_ary_clear(rb_argv);
     for (i=0; i < argc; i++) {
 	rb_ary_push(rb_argv, rb_tainted_str_new2(argv[i]));
     }