diff --git a/src/map/pc.c b/src/map/pc.c
index dd1c19c495..5f74574d64 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -700,9 +700,14 @@ static int pc_isAllowedCardOn(struct map_session_data *sd,int s,int eqindex,int
 	int i;
 	struct item *item = &sd->status.inventory[eqindex];
 	struct item_data *data;
+	
 	//Crafted/made/hatched items.
 	if (itemdb_isspecial(item->card[0]))
 		return 1;
+
+	/* scan for enchant armor gems */
+	if( item->card[MAX_SLOTS - 1] && s < MAX_SLOTS - 1 )
+		s = MAX_SLOTS - 1;
 	
 	ARR_FIND( 0, s, i, item->card[i] && (data = itemdb_exists(item->card[i])) != NULL && data->flag.no_equip&flag );
 	return( i < s ) ? 0 : 1;