diff --git a/desktop/src-common/advent/screens/rooms/castle_gate.clj b/desktop/src-common/advent/screens/rooms/castle_gate.clj
index b9bcce6c..a5d970ee 100644
--- a/desktop/src-common/advent/screens/rooms/castle_gate.clj
+++ b/desktop/src-common/advent/screens/rooms/castle_gate.clj
@@ -74,10 +74,10 @@
                                                                            :frankie "What?!"
                                                                            :frankie "Impossible!")
                                                           (actions/play-animation entities :frankie :laugh)
+                                                          (actions/update-state entities (fn [s] (assoc s :bubba-gone? true)))
                                                           (actions/do-dialogue entities :frankie "Bubba, go check to make sure our stuff is safe."
                                                                                :goon-2 "You got it boss.")
-                                                          (actions/walk-straight-to entities :goon-2 [0 100])
-                                                          (actions/update-state entities (fn [s] (assoc s :bubba-gone? true))))}
+                                                          (actions/walk-straight-to entities :goon-2 [0 100]))}
 
                                                "Nevermind."
                                                {:run #(actions/respond entities % :frankie "Come back when you've got some good valuables.")}]}))
@@ -202,7 +202,7 @@
                                       (actions/talk entities :goon-2 "You made me lose my coin, Dipstick!" :anim :search)
                                       (actions/talk entities :ego "Umm, sorry!"))
                                     (do
-                                      (actions/do-dialogue entities :ego "Hey Bubba!"
+                                      (actions/do-dialogue entities :ego "Hi Bubba."
                                                            :goon-2 "Beat it, Dipstick."))))
       :scripts {:money (actions/get-script entities
                                              (actions/do-dialogue entities :ego "I don't want to give it back!"))
@@ -221,7 +221,10 @@
 
 (defn flip-coin [screen entities]
   (if (and (= 0 (rand-int 2))
-       (not (get-in entities [:state :has-dropped-coin?])))
+           (not (get-in entities [:state :has-dropped-coin?]))
+           (not (get-in entities [:state :bubba-gone?]))
+           (= (get-in entities [:room :entities :goon-2 :anim])
+              (get-in entities [:room :entities :goon-2 :stand])))
     (-> entities
         (update-in [:room :entities :coin-flip] (fn [cf] (-> (actions/start-animation screen cf :coinflip)
                                                             (assoc :opacity 1.0))))
diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj
index 6345a0f9..78e6eea2 100644
--- a/desktop/src-common/advent/screens/rooms/outside_castle.clj
+++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj
@@ -224,6 +224,7 @@
                            :ego "No, not the Slinger's Shot!"
                            :frankie "Look like we hit the jackpot tonight boys!") 
       (frankie-comment-on-item entities)
+      (actions/update-state entities #(assoc % :bubba-gone? true))
       (actions/do-dialogue entities
                            :frankie "Bubba, put this stuff in the secret stash."
                            :goon-2 "You got it boss.")
@@ -238,7 +239,6 @@
       (actions/remove-item entities :medal)
       (actions/remove-item entities :trophy)
       (actions/remove-item entities :slingshot)
-      (actions/update-state entities #(assoc % :bubba-gone? true))
 
       (actions/walk-to entities :ego [181 79])
       (actions/do-dialogue entities