diff --git a/autojump.bash b/autojump.bash
index 064e90a..17d5a80 100644
--- a/autojump.bash
+++ b/autojump.bash
@@ -1,17 +1,14 @@
 #This shell snippet sets the prompt command and the necessary aliases
-#Only excecute if the shell is bash and it is interactive
-if [ "$BASH_VERSION" ] && [ -n "$PS1" ]; then
-    _autojump() 
-    {
-            local cur
-            COMPREPLY=()
-            unset COMP_WORDS[0] #remove "j" from the array
-            cur=${COMP_WORDS[*]}
-            IFS=$'\n' read -d '' -a COMPREPLY < <(autojump --completion "$cur")
-            return 0
-    }
-    complete -F _autojump j
-    export PROMPT_COMMAND='autojump -a "$(pwd -P)"'
-    alias jumpstat="autojump --stat"
-    function j { new_path="$(autojump $@)";if [ -n "$new_path" ]; then echo -e "\\033[31m${new_path}\\033[0m"; echo; cd "$new_path";fi }
-fi
+_autojump() 
+{
+        local cur
+        COMPREPLY=()
+        unset COMP_WORDS[0] #remove "j" from the array
+        cur=${COMP_WORDS[*]}
+        IFS=$'\n' read -d '' -a COMPREPLY < <(autojump --completion "$cur")
+        return 0
+}
+complete -F _autojump j
+export PROMPT_COMMAND='autojump -a "$(pwd -P)"'
+alias jumpstat="autojump --stat"
+function j { new_path="$(autojump $@)";if [ -n "$new_path" ]; then echo -e "\\033[31m${new_path}\\033[0m"; echo; cd "$new_path";fi }
diff --git a/autojump.sh b/autojump.sh
index 6a91c6f..2202663 100755
--- a/autojump.sh
+++ b/autojump.sh
@@ -1,5 +1,5 @@
 #Source autojump.bashrc only if we're on bash, as it is
 #not compatible with other shells
-if [ "$BASH_VERSION" ] && [ -n "$PS1" ]; then
+if [ "$BASH_VERSION" ] && [ -n "$PS1" ] && echo $SHELLOPTS | grep -v posix >>/dev/null; then
 	. /etc/profile.d/autojump.bash
 fi