diff --git a/bashrc b/bashrc
index 01abc7a..3986e01 100644
--- a/bashrc
+++ b/bashrc
@@ -5,9 +5,9 @@
 
 
 SYSTEM_DIR=$HOME/system
-SYSTEM_BASH_DIR=$SYSTEM_DIR/bash.d
+SYSTEM_BASH_DIR="$(realpath $(dirname ${BASH_SOURCE[0]}))"
 # Export for scripts
-export SYSTEM_SH_LIB_DIR=$SYSTEM_BASH_DIR/lib
+export SYSTEM_SH_LIB_DIR="$SYSTEM_BASH_DIR/lib"
 
 source_if_exists() {
     if [ -f "$1" ]; then