diff --git a/fish_prompt.fish b/fish_prompt.fish
index 965cc6e..365cc0b 100644
--- a/fish_prompt.fish
+++ b/fish_prompt.fish
@@ -33,9 +33,9 @@ set __bobthefish_superuser_glyph         '$ '
 set __bobthefish_bg_job_glyph            '% '
 
 # Python glyphs
-set __bobthefish_superscript             \u00B1 \u00B2 \u00B3
+set __bobthefish_superscript_glyph       \u00B1 \u00B2 \u00B3
 set __bobthefish_virtualenv_glyph        \u25F0
-set __bobthefish_pypy                    \u1D56
+set __bobthefish_pypy_glyph              \u1D56
 
 # Colors
 set __bobthefish_lt_green   addc10
@@ -265,11 +265,11 @@ end
 function __bobthefish_virtualenv_python_version -d 'Get current python version'
   switch (readlink (which python))
     case python2
-      echo $__bobthefish_superscript[2]
+      echo $__bobthefish_superscript_glyph[2]
     case python3
-      echo $__bobthefish_superscript[3]
+      echo $__bobthefish_superscript_glyph[3]
     case pypy
-      echo $__bobthefish_pypy
+      echo $__bobthefish_pypy_glyph
     end
 end
 
@@ -295,13 +295,13 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
   set -g RETVAL $status
   __bobthefish_prompt_status
   __bobthefish_prompt_user
+  if __bobthefish_in_virtualfish_virtualenv
+    __bobthefish_promt_virtualfish
+  end
   if __bobthefish_in_git
     __bobthefish_prompt_git
   else
     __bobthefish_prompt_dir
   end
-  if __bobthefish_in_virtualfish_virtualenv
-    __bobthefish_promt_virtualfish
-  end
   __bobthefish_finish_segments
 end