diff --git a/scheme/httpd/cgi-server.scm b/scheme/httpd/cgi-server.scm
index e1407d0..92e40c3 100644
--- a/scheme/httpd/cgi-server.scm
+++ b/scheme/httpd/cgi-server.scm
@@ -81,10 +81,10 @@
 (define (cgi-handler bin-dir . maybe-cgi-bin-path)
   (let-optionals
       maybe-cgi-bin-path
-      ((cgi-bin-path cgi-default-bin-path))
+      ((cgi-bin-path cgi-default-bin-path)))
     
     (let ((request-invariant-cgi-env    ; environment variables that never change
-	   `(("PATH"              . ,(and (getenv "PATH") cgi-bin-path))
+	   `(("PATH"              . ,cgi-bin-path)
 	     ("SERVER_SOFTWARE"   . ,sunet-version-identifier)
 	     ("SERVER_NAME"       . ,(host-info:name (host-info (system-name))))
 	     ("GATEWAY_INTERFACE" . "CGI/1.1"))))