diff --git a/bash/bashrc/sources/40_go-command b/bash/bashrc/sources/40_go-command
index f64167f..15346b7 100755
--- a/bash/bashrc/sources/40_go-command
+++ b/bash/bashrc/sources/40_go-command
@@ -95,17 +95,19 @@ __go_nav() {
         LISTOF=''
         for i in "${!PWDA[@]}"
         do
-            MARK=$i
-            if [[ "${PWDA[$i]}" =~ $ARG3 ]]; then
+            STACK=${PWDA[$i]}
+            if [ -z "$STACK" ]; then
                 continue
             fi
 
-            if [[ "${PWDA[$i]}" =~ $ARG3 ]]; then
+            MARK=$i
+
+            if [ -n "$ARG3" ] && [[ "$STACK" =~ "$ARG3" ]]; then
                 break
             fi
 
-            if [[ -n "${PWDA[$i]}" ]]; then
-                LISTOF="$LISTOF\n    ${PWDA[$i]}";
+            if [[ -n "$STACK" ]]; then
+                LISTOF="$LISTOF\n    $STACK";
             fi
         done