diff --git a/src/game/DBCStructure.h b/src/game/DBCStructure.h
index 66e5f3ff6..1b5a2bb44 100644
--- a/src/game/DBCStructure.h
+++ b/src/game/DBCStructure.h
@@ -1718,6 +1718,11 @@ struct SpellEntry
         bool IsFitToFamilyMask(SpellFamily family, T t) const;
 };
 
+// A few fields which are required for automated convertion
+// NOTE that these fields are count by _skipping_ the fields that are unused!
+#define LOADED_SPELLDBC_FIELD_POS_EQUIPPED_ITEM_CLASS  65   // Must be converted to -1
+#define LOADED_SPELLDBC_FIELD_POS_SPELLNAME_0          132  // Links to "MaNGOS server-side spell"
+
 struct SpellCastTimesEntry
 {
     uint32    ID;                                           // 0        m_ID
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 1c8c5cbd7..70ecb00cf 100755
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -6776,7 +6776,7 @@ struct SQLSpellLoader : public SQLStorageLoaderBase<SQLSpellLoader>
     template<class S, class D>
     void default_fill(uint32 field_pos, S src, D &dst)
     {
-        if (field_pos == 65)                                // EquippedItemClass
+        if (field_pos == LOADED_SPELLDBC_FIELD_POS_EQUIPPED_ITEM_CLASS)
             dst = D(-1);
         else
             dst = D(src);
@@ -6784,7 +6784,7 @@ struct SQLSpellLoader : public SQLStorageLoaderBase<SQLSpellLoader>
 
     void default_fill_to_str(uint32 field_pos, char const* /*src*/, char * & dst)
     {
-        if (field_pos == 132)                               // SpellName[0]
+        if (field_pos == LOADED_SPELLDBC_FIELD_POS_SPELLNAME_0)
         {
             dst = SERVER_SIDE_SPELL;
         }
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 7f23fadce..9d20fd781 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 "12054"
+ #define REVISION_NR "12055"
 #endif // __REVISION_NR_H__