diff --git a/functions/utils.zsh b/functions/utils.zsh
index c9b3b8a6719834bc8ce05d091ebc3269f1c12291..eac741732e9b4a4865baba511cda53a828dccf55 100644
--- a/functions/utils.zsh
+++ b/functions/utils.zsh
@@ -16,7 +16,7 @@ set_default () {
 	# /!\ compute differently with color variables
 	# TODO make the regex case-insensitive
 	if [[ $1 =~ '_COLOR(_.*)?$' ]]; then
-		set_default_color $1 $2
+		set_default_color "$@"
 	else
 		# See http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion-Flags
 		[[ -z ${(P)1} ]] && typeset -g $1=$2
diff --git a/via.zsh-theme b/via.zsh-theme
index 0953d2748caf395671c01135aff5e87cc7f51603..f981a92c48c53350b9b8549503ffb6474ec93ede 100644
--- a/via.zsh-theme
+++ b/via.zsh-theme
@@ -72,6 +72,8 @@ eval +vi-theme-$OHMYVIA_VCS_THEME
 zstyle ':vcs_info:*' formats       " $OHMYVIA_VCS_PROMPT_NORMAL"
 zstyle ':vcs_info:*' actionformats " $OHMYVIA_VCS_PROMPT_ACTION"
 
+# Override precmd to update vcs_info_msg_0_ before prompt.
+# See http://zsh.sourceforge.net/Doc/Release/Functions.html#Hook-Functions
 precmd () { vcs_info }
 RPROMPT='${vcs_info_msg_0_}'