diff --git a/punyverse/launcher.c b/punyverse/launcher.c
index 9446be1..5766fc5 100644
--- a/punyverse/launcher.c
+++ b/punyverse/launcher.c
@@ -11,10 +11,11 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 int main()
 #endif
 {
-    int argc = __argc;
 #if PY_MAJOR_VERSION >= 3
-    LPWSTR *argv = __wargv;
+	int argc;
+	LPWSTR *argv = CommandLineToArgvW(GetCommandLineW(), &argc);
 #else
+    int argc = __argc;
     char **argv = __argv;
 #endif
 
diff --git a/punyverse/main.py b/punyverse/main.py
index 00187fa..34cf4d3 100644
--- a/punyverse/main.py
+++ b/punyverse/main.py
@@ -4,7 +4,7 @@ import pyglet
 
 INITIAL_WIN_HEIGHT = 540
 INITIAL_WIN_WIDTH = 700
-DEBUG = True
+DEBUG = False
 
 
 def main():