diff --git a/src/fileops.lisp b/src/fileops.lisp
index 87a0bf2..7534f80 100644
--- a/src/fileops.lisp
+++ b/src/fileops.lisp
@@ -13,7 +13,8 @@
            #:extract-lang-and-filename
            #:questionnaires-list-files
            #:questionnaires-dir
-           #:make-surveys-db-file))
+           #:make-surveys-db-file
+           #:survey-db))
 
 (in-package #:ml-survey/fileops)
 
diff --git a/src/surveys.lisp b/src/surveys.lisp
index 44b0040..ceefaab 100644
--- a/src/surveys.lisp
+++ b/src/surveys.lisp
@@ -57,9 +57,8 @@ SURVEYS: List of survey objects."
                                         nil))))))))))
 
 (define-easy-handler (surveys-handler :uri "/") nil
-  (let* ((survey-db (ml-survey/fileops:read-from-file (ml-survey/fileops:make-surveys-db-file)))
-         (list-of-surveys (mapcar (lambda (x)
+  (let* ((list-of-surveys (mapcar (lambda (x)
                                     (make-instance 'ml-survey/survey:survey
                                                    :id (format nil "~a" (first x))))
-                                  survey-db)))
+                                  (ml-survey/fileops:survey-db))))
     (view list-of-surveys)))