diff --git a/src/map/map.c b/src/map/map.c
index b3d436fd74..03ee9f30c1 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -116,7 +116,7 @@ static int block_free_count = 0, block_free_lock = 0;
 static struct block_list *bl_list[BL_LIST_MAX];
 static int bl_list_count = 0;
 
-#define MAP_MAX_MSG 1500
+#define MAP_MAX_MSG 1600
 
 struct map_data map[MAX_MAP_PER_SERVER];
 int map_num = 0;
diff --git a/src/map/status.c b/src/map/status.c
index 52c762d558..4d628e7212 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -10996,9 +10996,16 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const
 
 	if( opt_flag&8 ) // bugreport:681
 		clif_changeoption2(bl);
-	else if(opt_flag)
+	else if(opt_flag) {
 		clif_changeoption(bl);
-
+		if (sd && (opt_flag&0x4)) {
+			clif_changelook(bl,LOOK_BASE,sd->vd.class_);
+			clif_get_weapon_view(sd,&sd->vd.weapon,&sd->vd.shield);
+			clif_changelook(bl,LOOK_WEAPON,sd->vd.weapon);
+			clif_changelook(bl,LOOK_SHIELD,sd->vd.shield);
+			clif_changelook(bl,LOOK_CLOTHES_COLOR,cap_value(sd->status.clothes_color,0,battle_config.max_cloth_color));
+		}
+	}
 	if (calc_flag)
 		status_calc_bl(bl,calc_flag);