diff --git a/themes/bobthefish/fish_prompt.fish b/themes/bobthefish/fish_prompt.fish
index 841ae8bde8d3bed6fd9e5b414080f4d6b5c60cb7..32efc568941f839f247fbae11f31ae320f839749 100644
--- a/themes/bobthefish/fish_prompt.fish
+++ b/themes/bobthefish/fish_prompt.fish
@@ -181,7 +181,7 @@ function __bobthefish_prompt_status -d 'Display symbols for a non zero exit stat
   set -l bg_jobs
 
   # Last exit was nonzero
-  if [ $RETVAL -ne 0 ]
+  if [ $status -ne 0 ]
     set nonzero $__bobthefish_nonzero_exit_glyph
   end
 
@@ -345,7 +345,6 @@ end
 # ===========================
 
 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