diff --git a/bashrc b/bashrc
index fcd8f47..abfb7f4 100644
--- a/bashrc
+++ b/bashrc
@@ -10,6 +10,6 @@ for rc_file in $WORKSPACE/rc/*; do
   source $rc_file
 done
 
-#export PATH=$($WORKSPACE/bin/path-uniq.py $WORKSPACE/bin $WORKSPACE/opt/bin)
-export PATH=$(echo "$PATH" | tr ":" "\n" | awk '!seen[$0]++' | tr "\n" ":")
-
+PATH="$PATH:$LWS/bin"
+PATH="$(uniq_path)"
+export PATH
diff --git a/rc/functions.sh b/rc/functions.sh
index 40bb19c..2325b99 100644
--- a/rc/functions.sh
+++ b/rc/functions.sh
@@ -31,4 +31,6 @@ function prepend_path() {
   fi
 }
 
-
+function uniq_path() {
+  echo "$PATH" | tr ":" "\n" | awk '!seen[$0]++' | tr "\n" ":" | sed -r 's/:+/:/g' | sed -r 's/^:|:$//g'
+}