diff --git a/src/map/guild.c b/src/map/guild.c
index 4bf006e5b9..84cbe137d2 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -72,7 +72,7 @@ static int guild_send_xy_timer(int tid,unsigned int tick,int id,int data);
  // Modified [Komurka]
 int guild_skill_get_max (int id)
 {
-	if (id  < GD_SKILLBASE || id > GD_SKILLBASE+MAX_GUILDSKILL)
+	if (id < GD_SKILLBASE || id >= GD_SKILLBASE+MAX_GUILDSKILL)
 		return 0;
 	return guild_skill_tree[id-GD_SKILLBASE].max;
 }
diff --git a/src/map/status.c b/src/map/status.c
index 9310e1b573..2c9539b288 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -66,7 +66,7 @@ int current_equip_card_id; //To prevent card-stacking (from jA) [Skotlex]
 static void add_sc(int skill, int sc)
 {
 	int sk = skill;
-	if (sk > GD_SKILLBASE) sk = skill - GD_SKILLBASE + SC_GD_BASE;
+	if (sk >= GD_SKILLBASE) sk = skill - GD_SKILLBASE + SC_GD_BASE;
 	else
 	if (sk >= HM_SKILLBASE) sk = skill - HM_SKILLBASE + SC_HM_BASE;
 	if (sk < 0 || sk >= MAX_SKILL) {
@@ -508,7 +508,7 @@ void initChangeTables(void)
 int SkillStatusChangeTable(int skill)
 {
 	int sk = skill;
-	if (sk > GD_SKILLBASE) sk = skill - GD_SKILLBASE + SC_GD_BASE;
+	if (sk >= GD_SKILLBASE) sk = skill - GD_SKILLBASE + SC_GD_BASE;
 	else
 	if (sk >= HM_SKILLBASE) sk = skill - HM_SKILLBASE + SC_HM_BASE;
 	if (sk < 0 || sk >= MAX_SKILL) {