diff --git a/lib/std/kxgetopt.kx b/lib/std/kxgetopt.kx
index 47e607ef..2e7fdbb7 100644
--- a/lib/std/kxgetopt.kx
+++ b/lib/std/kxgetopt.kx
@@ -93,3 +93,8 @@ _class GetOpt {
         }
     }
 }
+
+System.GetOpt.getFunction = _function() {
+    return new Fiber(new GetOpt().getopt).resume;
+};
+System.getopt = System.GetOpt.getFunction();
diff --git a/lib/std/kxstartup.kx b/lib/std/kxstartup.kx
index cc28683b..87bb8f01 100644
--- a/lib/std/kxstartup.kx
+++ b/lib/std/kxstartup.kx
@@ -50,8 +50,6 @@ var Xml, Net;
     _functional_compose2 = __functional_compose2;
     Range = _Range;
     System.setupRange(Range.create);
-    System.GetOpt = GetOpt;
-    System.getopt = new Fiber(new GetOpt().getopt).resume;
     Iconv = _Iconv;
     Clipboard = _Clipboard;
     $stdin = new File('<stdin>', File.READ);