Index: src/map/mob.c
===================================================================
--- src/map/mob.c	(revision 17319)
+++ src/map/mob.c	(working copy)
@@ -2629,15 +2629,6 @@
 	if (battle_config.mvp_tomb_enabled && md->spawn->state.boss)
 		mvptomb_create(md, mvp_sd ? mvp_sd->status.name : NULL, time(NULL));
 
-	// Remove all status changes before creating a respawn
-	if( sc ) {
-		for(i=0; i<SC_MAX; i++){
-			if(sc->data[i] && (sc->data[i]->timer != INVALID_TIMER))
-				delete_timer(sc->data[i]->timer, status_change_timer);
-		}
-		memset( sc, 0, sizeof( struct status_change ) );
-	}
-
 	if( !rebirth )
 		mob_setdelayspawn(md); //Set respawning.
 	return 3; //Remove from map.
Index: src/map/status.c
===================================================================
--- src/map/status.c	(revision 17319)
+++ src/map/status.c	(working copy)
@@ -9250,6 +9251,14 @@
 	sc->opt2 = 0;
 	sc->opt3 = 0;
 
+	//cleaning all extras vars
+	sc->comet_x = 0;
+	sc->comet_y = 0;
+#ifndef RENEWAL
+	sc->sg_counter = 0;
+#endif
+	sc->bs_counter = 0;
+
 	if( type == 0 || type == 2 )
 		clif_changeoption(bl);
 
@@ -11000,6 +11009,15 @@
 		}
 		status_change_end(bl, (sc_type)i, INVALID_TIMER);
 	}
+
+	//cleaning all extras vars
+	sc->comet_x = 0;
+	sc->comet_y = 0;
+#ifndef RENEWAL
+	sc->sg_counter = 0;
+#endif
+	sc->bs_counter = 0;
+
 	return 0;
 }