diff --git a/dobroho_vechora.bash b/dobroho_vechora.bash
index b40a7e5..0ffd906 100755
--- a/dobroho_vechora.bash
+++ b/dobroho_vechora.bash
@@ -94,7 +94,7 @@ while :; do
 	case "${cmd}" in
 		I)
 			tmp="$(mktemp)"
-			command ${VISUAL:-${EDITOR:-$(command -v vi)}} "${tmp}"
+			"${VISUAL:-"${EDITOR:-"$(which vi)"}"}" "${tmp}"
 			[ -s "${tmp}" ] && send_message 0"${nick}$(cat "${tmp}")"
 			rm "${tmp}"
 			;;