diff --git a/main.py b/main.py
index f4c1fd1..e891255 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from morss import main, cgi_wrapper as application
+from morss import main, cgi_standalone_app as application
 
 if __name__ == '__main__':
     main()
diff --git a/morss/morss.py b/morss/morss.py
index 36df115..7c074e3 100644
--- a/morss/morss.py
+++ b/morss/morss.py
@@ -719,6 +719,9 @@ def cgi_encode(environ, start_response, app):
     return [x if isinstance(x, bytes) else str(x).encode('utf-8') for x in out]
 
 
+cgi_standalone_app = cgi_encode(cgi_error_handler(cgi_dispatcher(cgi_file_handler(cgi_app))))
+
+
 def cli_app():
     options = Options(filterOptions(parseOptions(sys.argv[1:-1])))
     url = sys.argv[-1]