diff --git a/src/app/file.lisp b/src/app/file.lisp
index 97576e8..5a8dc93 100644
--- a/src/app/file.lisp
+++ b/src/app/file.lisp
@@ -64,5 +64,5 @@
          :content-length ,(file-length stream)
          :last-modified
          ,(format-rfc1123-timestring nil
-                                     (universal-to-timestamp univ-time))
-         ,file)))))
+                                     (universal-to-timestamp univ-time)))
+        ,file))))
diff --git a/src/middleware/static.lisp b/src/middleware/static.lisp
index 20faa6b..7923f5b 100644
--- a/src/middleware/static.lisp
+++ b/src/middleware/static.lisp
@@ -20,7 +20,7 @@
                (progn
                  (setf (getf env :path-info)
                        (subseq path-info (1- (length path))))
-                 (call-app-file :TODO))
+                 (call-app-file root env))
                (funcall app env)))))
       (function
        (lambda (env)
@@ -28,7 +28,7 @@
           (if-let (new-path (funcall path path-info))
             (progn
               (setf (getf env :path-info) new-path)
-              (call-app-file :TODO))
+              (call-app-file root env))
             (funcall app env))))))))
 
 (defun call-app-file (root env)