diff --git a/lib/chingu/game_state_manager.rb b/lib/chingu/game_state_manager.rb
index 120d0fd7..11ff4282 100644
--- a/lib/chingu/game_state_manager.rb
+++ b/lib/chingu/game_state_manager.rb
@@ -131,6 +131,7 @@ def push_game_state(state, options = {})
                 
         # Give the soon-to-be-disabled state a chance to clean up by calling finalize() on it.
         current_game_state.finalize   if current_game_state.respond_to?(:finalize) && options[:finalize]
+        new_state.previous_game_state = current_game_state
         
         if @transitional_game_state && options[:transitional]
           # If we have a transitional, push that instead, with new_state as first argument
@@ -280,4 +281,4 @@ def game_state_instance(state)
     end
     
   end
-end
\ No newline at end of file
+end
diff --git a/lib/chingu/helpers/gfx.rb b/lib/chingu/helpers/gfx.rb
index 0d8070f6..befb7387 100644
--- a/lib/chingu/helpers/gfx.rb
+++ b/lib/chingu/helpers/gfx.rb
@@ -185,7 +185,7 @@ def _stroke_rect(rect, color_a, color_b, color_c, color_d, zorder, mode)
       $window.draw_line(left,  top,    color_a, left,  bottom, color_b, zorder, mode)
       $window.draw_line(left,  bottom, color_b, right, bottom, color_c, zorder, mode)
       $window.draw_line(right, bottom, color_c, right, top,    color_d, zorder, mode)
-      $window.draw_line(right, top,    color_d, left,  top,    color_a, zorder, mode)
+      $window.draw_line(right + 1, top,    color_d, left,  top,    color_a, zorder, mode) # make a COMPLETE rectangle
     end
     
     #
@@ -230,4 +230,4 @@ def _walk_arc(from, to, detail, &block)
   end
   
   end
-end
\ No newline at end of file
+end