diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index ee2b3a090..3bbef0afc 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,7 @@
 Changes towards version 0.3:
+- Guardian in Blazer mode being drained by DOGI will no longer
+  result in a non-blazer Guardian with Blazer effects. Original sc2 bug.
+  (bug #283); from chmmravatar
 - 'CREW' and 'BATT' instead of icons in combat screen when using
   PC-style menus (bug #308); from Paxtez
 - New shipyard SCRAP system with scrapping confirmation
diff --git a/sc2/WhatsNew b/sc2/WhatsNew
index 4218bd15e..df4855d74 100644
--- a/sc2/WhatsNew
+++ b/sc2/WhatsNew
@@ -72,6 +72,8 @@ BUGFIXES
 - Various minor graphics glitch fixes
 - Crew death on planet is now counted properly in all cases
 - Mouse cursor is now hidden in fullscreen mode
+- Guardian in Blazer mode being drained by DOGI will no longer
+  result in a non-blazer Guardian with Blazer effects.
 
 INTERNAL CHANGES
 
diff --git a/sc2/src/sc2code/ships/androsyn/androsyn.c b/sc2/src/sc2code/ships/androsyn/androsyn.c
index a0d1c18a8..cf4058baa 100644
--- a/sc2/src/sc2code/ships/androsyn/androsyn.c
+++ b/sc2/src/sc2code/ships/androsyn/androsyn.c
@@ -331,25 +331,25 @@ androsynth_postprocess (PELEMENT ElementPtr)
 		if ((StarShipPtr->cur_status_flags & SPECIAL)
 				|| StarShipPtr->RaceDescPtr->ship_info.energy_level == 0)
 		{
-			StarShipPtr->RaceDescPtr->characteristics.special_wait =
-					StarShipPtr->RaceDescPtr->characteristics.turn_wait;
-			StarShipPtr->RaceDescPtr->characteristics.turn_wait = BLAZER_TURN_WAIT;
 			StarShipPtr->RaceDescPtr->characteristics.energy_regeneration =
 					(BYTE)BLAZER_DEGENERATION;
 			StarShipPtr->energy_counter = ENERGY_WAIT;
-			ElementPtr->mass_points = BLAZER_MASS;
-			ship_collision_func[WHICH_SIDE(ElementPtr->state_flags)] = ElementPtr->collision_func;
-			{
-				ElementPtr->collision_func = blazer_collision;
-			}
 
 			if (StarShipPtr->cur_status_flags & SPECIAL)
 			{
 				ProcessSound (SetAbsSoundIndex (
-								/* COMET_ON */
-						StarShipPtr->RaceDescPtr->ship_data.ship_sounds, 1), ElementPtr);
+						StarShipPtr->RaceDescPtr->ship_data.ship_sounds, 1),
+						ElementPtr);  /* COMET_ON */
 				ElementPtr->turn_wait = 0;
 				ElementPtr->thrust_wait = 0;
+				StarShipPtr->RaceDescPtr->characteristics.special_wait =
+						StarShipPtr->RaceDescPtr->characteristics.turn_wait;
+				ElementPtr->mass_points = BLAZER_MASS;
+				StarShipPtr->RaceDescPtr->characteristics.turn_wait
+						= BLAZER_TURN_WAIT;
+				ship_collision_func[WHICH_SIDE(ElementPtr->state_flags)]
+						= ElementPtr->collision_func;
+				ElementPtr->collision_func = blazer_collision;
 			}
 		}