diff --git a/bin/autojump b/bin/autojump
index 5a39a75..68fdabc 100755
--- a/bin/autojump
+++ b/bin/autojump
@@ -198,9 +198,9 @@ def handle_tab_completion(needle, entries):
         print_local(tab_path)
     elif tab_index:
         get_ith_path = lambda i, iterable: last(take(i, iterable)).path
-        print_local(get_ith_path(
-            tab_index,
-            find_matches(entries, [tab_needle], check_entries=False)))
+        matches_from_index = find_matches(entries, [tab_needle], check_entries=False)
+        matching_path = get_ith_path(tab_index, matches_from_index)
+        print_local(matching_path)
     elif tab_needle:
         # found partial tab completion entry
         print_tab_menu(
diff --git a/bin/autojump.bash b/bin/autojump.bash
index 21fe9bf..4f21d72 100644
--- a/bin/autojump.bash
+++ b/bin/autojump.bash
@@ -29,8 +29,32 @@ _autojump() {
         $comps
 EOF
 }
-complete -F _autojump j
+complete -F _autojump j jo
 
+_complete_autojump_c() {
+  local current_word
+  SAVE_IFS=$IFS
+  IFS=$'\n'
+  COMPREPLY=()
+  current_word="${COMP_WORDS[COMP_CWORD]}"
+  # tabbing on empty "prefix", e.g. jc <tab>
+  if [ -z "$current_word" ]; then
+    autocomplete_pattern="$PWD"
+  # tabbing when last item is a number, e.g. jc /some/path.*first.*second__2<tab>
+  elif [[ "$current_word" =~ ^[0-9]+$ ]]; then
+    autocomplete_pattern="${PWD}__$current_word"
+  # tabbing when last item contains .*, e.g. jc /some/path.*another<tab>
+  elif [[ "$current_word" =~ .*\.\*.* ]]; then
+    autocomplete_pattern="$current_word"
+  # tabbing when there are tokens, e.g. jc first second<tab>
+  else
+    autocomplete_pattern="${PWD}.*${current_word}"
+  fi
+  comps=$(autojump --complete "$autocomplete_pattern")
+  COMPREPLY=($(compgen -W "$comps" --))
+  IFS=$SAVE_IFS
+}
+complete -F _complete_autojump_c jc jco
 
 # change pwd hook
 autojump_add_to_database() {
@@ -69,14 +93,7 @@ j() {
 }
 
 
-# jump to child directory (subdirectory of current path)
-jc() {
-    if [[ ${@} == -* ]]; then
-        autojump ${@}
-    else
-        j $(pwd) ${@}
-    fi
-}
+alias jc=j
 
 
 # open autojump results in file browser
@@ -110,11 +127,4 @@ jo() {
 }
 
 
-# open autojump results (child directory) in file browser
-jco() {
-    if [[ ${@} == -* ]]; then
-        autojump ${@}
-    else
-        jo $(pwd) ${@}
-    fi
-}
+alias jco=jo