--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua	Sun May 26 17:40:38 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua	Sun May 26 17:53:14 2019 +0200
@@ -499,6 +499,7 @@
   end
   RestoreHedge(cyborg)
   DeleteGear(cyborg)
+  DismissTeam(fighterTeamName) -- just in case
   EndTurn(true)
 end
 
@@ -529,7 +530,7 @@
 function CyborgDeadReact()
   freshDead = nil
   if cyborgsLeft == 0 then
-    if not cratesTaken then
+    if (not cratesTaken) and (not CheckMissionFinished()) then
        AnimSay(native, loc("I still have to get rid of the crates."), SAY_THINK, 8000)
     end
     return