diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index f9e47d56f0..cac0ae9862 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -194,7 +194,7 @@ struct item_data* itemdb_exists(int nameid)
  * to the format used by the map server. [Skotlex]
  *------------------------------------------
  */
-static void itemdb_jobid2mapid(unsigned short *bclass, int jobmask)
+static void itemdb_jobid2mapid(unsigned int *bclass, int jobmask)
 {
 	int i;
 	bclass[0]= bclass[1]= bclass[2]= 0;
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index d95d64a43e..f65b4b943d 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -32,7 +32,7 @@ struct item_data {
 	int wlv;
 //Lupus: I rearranged order of these fields due to compatibility with ITEMINFO script command
 //		some script commands should be revised as well...
-	unsigned short class_base[3];	//Specifies if the base can wear this item (split in 3 indexes per type: 1-1, 2-1, 2-2)
+	unsigned int class_base[3];	//Specifies if the base can wear this item (split in 3 indexes per type: 1-1, 2-1, 2-2)
 	unsigned class_upper : 3; //Specifies if the upper-type can equip it (1: normal, 2: upper, 3: baby)
 	unsigned char *script;	// 攻撃,防御の属性設定もこの中で可能かな?
 	struct {