diff --git a/shell-functions b/shell-functions
index da03656..f03567c 100644
--- a/shell-functions
+++ b/shell-functions
@@ -50,7 +50,7 @@ function load_module {
 
     local modpath
     for p in $fpath; do
-        modpath=$p/$1
+        modpath=$p/$mod
         [[ -d $modpath ]] && break
         modpath=''
     done
@@ -60,6 +60,8 @@ function load_module {
         return 1
     fi
 
+    fpath+=($modpath)
+
     print_info -l 1 "Loading module: $mod"
     for func in `ls $modpath`; do
         print_info_sub -l 2 "Loading function: $func"