diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index bb1f4f5bd..5a7d53846 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -992,25 +992,11 @@ void Creature::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask)
         if (displayId != cinfo->ModelId[0] && displayId != cinfo->ModelId[1] &&
             displayId != cinfo->ModelId[2] && displayId != cinfo->ModelId[3])
         {
-            if (cinfo->ModelId[0])
-                if (CreatureModelInfo const *minfo = sObjectMgr.GetCreatureModelInfo(cinfo->ModelId[0]))
-                    if (displayId == minfo->modelid_other_gender)
-                        displayId = 0;
-
-            if (displayId && cinfo->ModelId[1])
-                if (CreatureModelInfo const *minfo = sObjectMgr.GetCreatureModelInfo(cinfo->ModelId[1]))
-                    if (displayId == minfo->modelid_other_gender)
-                        displayId = 0;
-
-            if (displayId && cinfo->ModelId[2])
-                if (CreatureModelInfo const *minfo = sObjectMgr.GetCreatureModelInfo(cinfo->ModelId[2]))
-                    if (displayId == minfo->modelid_other_gender)
-                        displayId = 0;
-
-            if (displayId && cinfo->ModelId[3])
-                if (CreatureModelInfo const *minfo = sObjectMgr.GetCreatureModelInfo(cinfo->ModelId[3]))
-                    if (displayId == minfo->modelid_other_gender)
-                        displayId = 0;
+            for(int i = 0; i < MAX_CREATURE_MODEL && displayId; ++i)
+                if (cinfo->ModelId[i])
+                    if (CreatureModelInfo const *minfo = sObjectMgr.GetCreatureModelInfo(cinfo->ModelId[i]))
+                        if (displayId == minfo->modelid_other_gender)
+                            displayId = 0;
         }
         else
             displayId = 0;
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 848c31fae..d64bc4b67 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "10303"
+ #define REVISION_NR "10304"
 #endif // __REVISION_NR_H__