diff --git a/completions/kickstart b/completions/kickstart
index 066376c..001a8f1 100644
--- a/completions/kickstart
+++ b/completions/kickstart
@@ -5,11 +5,11 @@ _kickstart_autocomplete() {
   local cur=${COM_WORDS[COM_CWORD]}
 
   if [ "$COMP_CWORD" -eq 1 ]; then
-    COMPREPLY=( $(compgen -W "`kickstart commands`" -- "$cur") )
+    COMPREPLY=( $(compgen -W "$(kickstart commands)" -- "$cur") )
   fi
 
   if [ "$COMP_CWORD" -eq 2 ] && [[ "${COMP_WORDS[1]}" == "doc" ]]; then
-    COMPREPLY=( $(compgen -W "`kickstart doc 2> /dev/null`" -- $cur) )
+    COMPREPLY=( $(compgen -W "$(kickstart doc 2> /dev/null)" -- "$cur") )
   fi
 
   return 0;
diff --git a/lib/kickstart-commands b/lib/kickstart-commands
index dc02245..6a39b9f 100755
--- a/lib/kickstart-commands
+++ b/lib/kickstart-commands
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 root_dir=$(kickstart root-dir)
-find "$root_dir"/lib -maxdepth | cut -f2- -d'-'
+find "$root_dir"/lib -d 1 | cut -f2- -d'-'