diff --git a/src/bind.zsh b/src/bind.zsh
index d8629f1..be0d164 100644
--- a/src/bind.zsh
+++ b/src/bind.zsh
@@ -10,14 +10,14 @@ _zsh_autosuggest_incr_bind_count() {
 		_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]=1
 	fi
 
-	bind_count=$_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]
+	typeset -gi bind_count=$_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]
 }
 
 _zsh_autosuggest_get_bind_count() {
 	if ((${+_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]})); then
-		bind_count=$_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]
+		typeset -gi bind_count=$_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]
 	else
-		bind_count=0
+		typeset -gi bind_count=0
 	fi
 }
 
diff --git a/src/highlight.zsh b/src/highlight.zsh
index a8ff08a..aa5a427 100644
--- a/src/highlight.zsh
+++ b/src/highlight.zsh
@@ -18,7 +18,7 @@ _zsh_autosuggest_highlight_apply() {
 	typeset -g _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
 
 	if [ $#POSTDISPLAY -gt 0 ]; then
-		_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT="$#BUFFER $(($#BUFFER + $#POSTDISPLAY)) $ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE"
+		typeset -g _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT="$#BUFFER $(($#BUFFER + $#POSTDISPLAY)) $ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE"
 		region_highlight+=("$_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT")
 	else
 		unset _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
diff --git a/src/strategies/default.zsh b/src/strategies/default.zsh
index 80c4842..17bf65d 100644
--- a/src/strategies/default.zsh
+++ b/src/strategies/default.zsh
@@ -11,5 +11,5 @@ _zsh_autosuggest_strategy_default() {
 
 	# Get the history items that match
 	# - (r) subscript flag makes the pattern match on values
-	suggestion="${history[(r)${(b)prefix}*]}"
+	typeset -g suggestion="${history[(r)${(b)prefix}*]}"
 }
diff --git a/src/strategies/match_prev_cmd.zsh b/src/strategies/match_prev_cmd.zsh
index e779340..8a84728 100644
--- a/src/strategies/match_prev_cmd.zsh
+++ b/src/strategies/match_prev_cmd.zsh
@@ -48,5 +48,5 @@ _zsh_autosuggest_strategy_match_prev_cmd() {
 	done
 
 	# Give back the matched history entry
-	suggestion="$history[$histkey]"
+	typeset -g suggestion="$history[$histkey]"
 }
diff --git a/zsh-autosuggestions.zsh b/zsh-autosuggestions.zsh
index 3c3162b..476e22b 100644
--- a/zsh-autosuggestions.zsh
+++ b/zsh-autosuggestions.zsh
@@ -131,14 +131,14 @@ _zsh_autosuggest_incr_bind_count() {
 		_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]=1
 	fi
 
-	bind_count=$_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]
+	typeset -gi bind_count=$_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]
 }
 
 _zsh_autosuggest_get_bind_count() {
 	if ((${+_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]})); then
-		bind_count=$_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]
+		typeset -gi bind_count=$_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]
 	else
-		bind_count=0
+		typeset -gi bind_count=0
 	fi
 }
 
@@ -257,7 +257,7 @@ _zsh_autosuggest_highlight_apply() {
 	typeset -g _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
 
 	if [ $#POSTDISPLAY -gt 0 ]; then
-		_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT="$#BUFFER $(($#BUFFER + $#POSTDISPLAY)) $ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE"
+		typeset -g _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT="$#BUFFER $(($#BUFFER + $#POSTDISPLAY)) $ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE"
 		region_highlight+=("$_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT")
 	else
 		unset _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
@@ -482,7 +482,7 @@ _zsh_autosuggest_strategy_default() {
 
 	# Get the history items that match
 	# - (r) subscript flag makes the pattern match on values
-	suggestion="${history[(r)${(b)prefix}*]}"
+	typeset -g suggestion="${history[(r)${(b)prefix}*]}"
 }
 
 #--------------------------------------------------------------------#
@@ -534,7 +534,7 @@ _zsh_autosuggest_strategy_match_prev_cmd() {
 	done
 
 	# Give back the matched history entry
-	suggestion="$history[$histkey]"
+	typeset -g suggestion="$history[$histkey]"
 }
 
 #--------------------------------------------------------------------#