diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index e817918ff..88cf6ac28 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,5 @@
 Changes towards version 0.5:
+- Fixed fast escape weirdness (bug #619) - from Jan Lönnberg
 - New topographical 4x planet surface scaler (bug #786) - Alex
 - Added support for Tremor for Ogg Vorbis decoding (avoids floating point
   math) - SvdB
diff --git a/sc2/src/sc2code/battle.c b/sc2/src/sc2code/battle.c
index 28ae2da5c..e7478720a 100644
--- a/sc2/src/sc2code/battle.c
+++ b/sc2/src/sc2code/battle.c
@@ -102,7 +102,8 @@ if ((InputState & DEVICE_BUTTON3)
 						if (GetPrimType (&DisplayArray[ElementPtr->PrimIndex]) == STAMP_PRIM
 								&& ElementPtr->life_span == NORMAL_LIFE
 								&& !(ElementPtr->state_flags & FINITE_LIFE)
-								&& ElementPtr->mass_points != MAX_SHIP_MASS * 10)
+								&& ElementPtr->mass_points != MAX_SHIP_MASS * 10
+								&& !(ElementPtr->state_flags & APPEARING))
 						{
 							extern void flee_preprocess (PELEMENT);