diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 5470fbf73e..fc8d9e464e 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/04/17
+	* The baby check when wearing a tuxedo/dress now works [Zido]
 	* Fixed pet being incorrectly removed when it had intimacy 0. [Skotlex]
 	* Some cleanup in the TK_RUN related code. [Skotlex]
 	* Added variable walk_count to unit_data to be use as a counter for cells
diff --git a/src/map/script.c b/src/map/script.c
index 66e77d9c8a..56a644f0c6 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -6329,8 +6329,8 @@ int buildin_changebase(struct script_state *st)
 	vclass = conv_num(st,& (st->stack->stack_data[st->start+2]));
 	if(vclass == JOB_WEDDING)
 	{
-		if (!battle_config.wedding_modifydisplay //Do not show the wedding sprites
-			//sd->class_&JOBL_BABY //Baby classes screw up when showing wedding sprites. [Skotlex] They don't seem to anymore.
+		if (!battle_config.wedding_modifydisplay || //Do not show the wedding sprites
+			sd->class_&JOBL_BABY //Baby classes screw up when showing wedding sprites. [Skotlex] They don't seem to anymore.
 			) 
 		return 0;
 	}