New stuff
diff --git a/units.c b/units.c
index 9bc6c39..0b58a21 100644
--- a/units.c
+++ b/units.c
@@ -6250,7 +6250,7 @@
     return a + b;
 }
 
-char *g_argv_0 = NULL;
+char g_argv_0[128] = "./units";
 
 
 void conversion_setup();
@@ -6396,16 +6396,11 @@
     }
 }
 
-
 void
 do_a_conversion(char *input, char *output, char *system)
 {
     char *inp, *out;
 
-    char units[] = "./units";
-
-    g_argv_0 = units;
-
     checklocale();
 
     num_format.format = NULL;
@@ -6420,21 +6415,12 @@
         setnumformat();
 
     setenv("UNITS_SYSTEM", system, 1);
-    printf("units system %s\n", getenv("UNITS_SYSTEM"));
+    // printf("units system %s\n", getenv("UNITS_SYSTEM"));
 
     conversion_worker(input, output);
 }
 
 
-int test_main()
-{
-    char a[] = "pi", b[] = "";
-    do_a_conversion(a, b, "si");
-    do_a_conversion(a, b, "si");
-    do_a_conversion(a, b, "si");
-}
-
-
 int
 old_main(int argc, char **argv)
 {