diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java
index f0cb1bdc..814dca39 100644
--- a/src/resources/objects/creature/CreatureObject.java
+++ b/src/resources/objects/creature/CreatureObject.java
@@ -55,6 +55,7 @@ import resources.common.OutOfBand;
 import resources.objects.ObjectMessageBuilder;
 import resources.objects.SWGList;
 import resources.objects.SWGMap;
+import resources.objects.SWGSet;
 import engine.resources.common.CRC;
 import engine.resources.objects.Baseline;
 import engine.resources.objects.SWGObject;
@@ -74,7 +75,7 @@ public class CreatureObject extends TangibleObject implements Serializable {
 	// CREO 1
 	private int bankCredits = 0;
 	private int cashCredits = 0;
-	private SWGList<String> skills;
+	private SWGSet<String> skills;
 	@NotPersistent
 	private transient int skillsUpdateCounter = 0;
 	
@@ -194,7 +195,7 @@ public class CreatureObject extends TangibleObject implements Serializable {
 		super(objectID, planet, position, orientation, Template);
 		messageBuilder = new CreatureMessageBuilder(this);
 		loadTemplateData();
-		skills = new SWGList<String>();
+		skills = new SWGSet<String>(this, 1, 4, false);
 		skillMods = new SWGMap<String, SkillMod>(this, 4, 3, true);
 		abilities = new SWGMap<String, Integer>(this, 4, 14, true);
 		missionCriticalObjects = new SWGMap<Long, Long>(this, 4, 13, false);
@@ -332,7 +333,7 @@ public class CreatureObject extends TangibleObject implements Serializable {
 		}
 	}
 
-	public SWGList<String> getSkills() {
+	public SWGSet<String> getSkills() {
 		return skills;
 	}