2 files changed, 2 insertions, 2 deletions
diff --git a/Completion/Bsd/_bsd_pkg b/Completion/Bsd/_bsd_pkg
index f302f8216..5089bc1a3 100644
--- a/Completion/Bsd/_bsd_pkg
+++ b/Completion/Bsd/_bsd_pkg
@@ -13,7 +13,7 @@ _bsd_pkg_packages() {
 }
 
 _bsd_pkg() {
-  case "${words[1]:t}" in
+  case "$service" in
   pkg_add)
     _arguments -s \
         '-v[be verbose]' \
diff --git a/Completion/Bsd/_kld b/Completion/Bsd/_kld
index 8fc719ccb..eefc8bf61 100644
--- a/Completion/Bsd/_kld
+++ b/Completion/Bsd/_kld
@@ -21,7 +21,7 @@ _kld_unload_id() {
 }
 
 _kld() {
-  case "${words[1]:t}" in
+  case "$service" in
   kldload)
     _arguments -s \
         '-v[be verbose]' \