diff --git a/bash/bashrc/sources/40_go-command b/bash/bashrc/sources/40_go-command
index 15346b7..7a97f83 100755
--- a/bash/bashrc/sources/40_go-command
+++ b/bash/bashrc/sources/40_go-command
@@ -92,6 +92,7 @@ __go_nav() {
         IFS="/" read -a PWDA <<< "$(pwd)"
 
         MARK=0
+        NOT_FOUND=1
         LISTOF=''
         for i in "${!PWDA[@]}"
         do
@@ -103,6 +104,7 @@ __go_nav() {
             MARK=$i
 
             if [ -n "$ARG3" ] && [[ "$STACK" =~ "$ARG3" ]]; then
+                unset NOT_FOUND
                 break
             fi
 
@@ -112,10 +114,11 @@ __go_nav() {
         done
 
         if [ -z "$ARG3" ]; then
+            unset NOT_FOUND
             MARK=$(( $MARK - 1 ))
         fi
 
-        if [[ $MARK -eq 0 ]]; then
+        if [ -n "$NOT_FOUND" ]; then
             echo "No such token in up stack: $ARG3"
             echo -e $LISTOF;
             echo