diff --git a/cmd-time.plugin.zsh b/cmd-time.plugin.zsh
index 0dd8a90..0893c74 100644
--- a/cmd-time.plugin.zsh
+++ b/cmd-time.plugin.zsh
@@ -1,5 +1,10 @@
+# -*- mode: sh; sh-indentation: 4; indent-tabs-mode: nil; sh-basic-offset: 4;-*-
 # Standardized $0 handling
 # (See https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html)
 0="${ZERO:-${${0:#$ZSH_ARGZERO}:-${(%):-%N}}}"
-0="${${(M)0:#/*}:-$PWD/$0}"
+# Set $0 with a new trik - use of %x prompt expansion
+0="${ZERO:-${${${(M)${0::=${(%):-%x}}:#/*}:-$PWD/$0}:A}}"
+local ZERO="$0"
+
 source ${0:A:h}/cmd-time.zsh
+# vim:ft=zsh:tw=80:sw=4:sts=4:et:foldmarker=[[[,]]]