diff --git a/generate.sh b/generate.sh
index 5421529..49e0d76 100755
--- a/generate.sh
+++ b/generate.sh
@@ -43,8 +43,7 @@ completion+="\n{"
 completion+="\n    local cur"
 completion+="\n    local prev"
 completion+="\n"
-completion+="\n    cur=\"\${COMP_WORDS[COMP_CWORD]}\""
-completion+="\n    prev=\"\${COMP_WORDS[COMP_CWORD-1]}\""
+completion+="\n    _get_comp_words_by_ref -n : cur prev"
 completion+="\n"
 completion+="\n    local -a words=("
 # generate list of commands
diff --git a/sfdx.bash b/sfdx.bash
index 643ccbc..824cb78 100644
--- a/sfdx.bash
+++ b/sfdx.bash
@@ -33,8 +33,7 @@ _sfdx()
     local cur
     local prev
 
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
+    _get_comp_words_by_ref -n : cur prev
 
     local -a words=(
         force:alias:list \