diff --git a/thefuck/shells/zsh.py b/thefuck/shells/zsh.py
index 219d2fd..f0e9208 100644
--- a/thefuck/shells/zsh.py
+++ b/thefuck/shells/zsh.py
@@ -11,11 +11,13 @@ class Zsh(Generic):
         # It is VERY important to have the variables declared WITHIN the function
         return '''
             {name} () {{
-                TF_ALIAS={name};
-                PYTHONIOENCODING=utf-8;
-                TF_SHELL_ALIASES=$(alias);
                 TF_PREVIOUS=$(fc -ln -1 | tail -n 1);
-                TF_CMD=$(thefuck $TF_PREVIOUS {argument_placeholder} $*) && eval $TF_CMD;
+                TF_CMD=$(
+                    TF_ALIAS={name}
+                    TF_SHELL_ALIASES=$(alias)
+                    PYTHONIOENCODING=utf-8
+                    thefuck $TF_PREVIOUS {argument_placeholder} $*
+                ) && eval $TF_CMD;
                 {alter_history}
             }}
         '''.format(