diff --git a/comp.go b/comp.go
index e8725d4..05f31c7 100644
--- a/comp.go
+++ b/comp.go
@@ -237,7 +237,7 @@ func compCmd(acc []rune) (matches []string, longestAcc []rune) {
 
 func compShell(acc []rune) (matches []string, longestAcc []rune) {
 	s := string(acc)
-	f := strings.Fields(s)
+	f := tokenize(s)
 
 	var longest string