diff --git a/bash_completion.sh b/bash_completion.sh
index 801d4eb..d2c1d71 100644
--- a/bash_completion.sh
+++ b/bash_completion.sh
@@ -18,7 +18,7 @@ _compile_scheme()
         #if [[ "$i" == "-t" ]] ; then
             #targetfound=true
         #fi
-    done
+    #done
 
     if [[ "$outputfound" == "false" ]]; then
         shortopts="${shortopts} -o"
diff --git a/compile-scheme.scm b/compile-scheme.scm
index 6736582..c4fa408 100644
--- a/compile-scheme.scm
+++ b/compile-scheme.scm
@@ -8,6 +8,8 @@
             (libs library-util)
             (srfi 170))
 
+(define debug? (if (member "--debug" (command-line)) #t #f))
+
 (when (member "--help" (command-line))
   (display "For help see: man compile-scheme")
   (newline)
@@ -204,6 +206,11 @@
            r6rs?
            compilation-target)))
 
+(when debug?
+  (display "[debug] scheme-command: ")
+  (write scheme-command)
+  (newline))
+
 (define scheme-library-command
   (lambda (library-file)
     (apply (cdr (assoc 'library-command (cdr (assoc scheme data))))
diff --git a/libs/data.sld b/libs/data.sld
index fffa1f3..bda4223 100644
--- a/libs/data.sld
+++ b/libs/data.sld
@@ -282,8 +282,7 @@
                                ,(util-getenv "COMPILE_R7RS_GUILE")
                                ,(if r6rs? " --r6rs -x .sls " " --r7rs -x .sld ")
                                ,@(map (lambda (item)
-                                        (string-append " -L " item " "
-                                                       " -L " (dirname item) " "))
+                                        (string-append " -L " item " "))
                                       (append prepend-directories
                                               append-directories))
                                " -s "