diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 714d88a..be72e12 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -218,7 +218,7 @@ function precmd() {
 
 function preexec () {
 	if [[ ! -v OVER_PROMPT_DISABLED ]]; then
-		__over_prompt_preexec || export OVER_PROMPT_DISABLED=1
+		__over_prompt_preexec "$1" || export OVER_PROMPT_DISABLED=1
 	fi
 }
 
diff --git a/lib/prompt-init b/lib/prompt-init
index 900ca98..57696f9 100755
--- a/lib/prompt-init
+++ b/lib/prompt-init
@@ -13,10 +13,7 @@ function __over_prompt_set_title {
 }
 
 function __over_prompt_preexec {
-	local -a cmd
-	cmd=(${(z)1})
-	
-	__over_prompt_set_title "${USER}: ${PWD} -> ${cmd}"
+	__over_prompt_set_title "${USER}: ${PWD} -> ${1}"
 }
 
 function __over_prompt_precmd {