diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/targeting/TargetHandler.java b/plugin-modules/Core/src/com/songoda/epicbosses/targeting/TargetHandler.java
index 0ed9ce3..b88b004 100644
--- a/plugin-modules/Core/src/com/songoda/epicbosses/targeting/TargetHandler.java
+++ b/plugin-modules/Core/src/com/songoda/epicbosses/targeting/TargetHandler.java
@@ -4,6 +4,7 @@ import com.songoda.epicbosses.holder.IActiveHolder;
 import com.songoda.epicbosses.managers.BossTargetManager;
 import com.songoda.epicbosses.utils.ServerUtils;
 import lombok.Getter;
+import org.bukkit.GameMode;
 import org.bukkit.entity.Creature;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
@@ -59,7 +60,7 @@ public abstract class TargetHandler<Holder extends IActiveHolder> implements ITa
             if(livingEntity instanceof Player) {
                 Player player = (Player) livingEntity;
 
-
+                if(player.getGameMode() == GameMode.SPECTATOR || player.getGameMode() == GameMode.CREATIVE) continue;
             }
 
             nearbyEntities.add(livingEntity);
diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/utils/itemstack/ItemStackConverter.java b/plugin-modules/Core/src/com/songoda/epicbosses/utils/itemstack/ItemStackConverter.java
index 442f892..5c66165 100644
--- a/plugin-modules/Core/src/com/songoda/epicbosses/utils/itemstack/ItemStackConverter.java
+++ b/plugin-modules/Core/src/com/songoda/epicbosses/utils/itemstack/ItemStackConverter.java
@@ -2,7 +2,6 @@ package com.songoda.epicbosses.utils.itemstack;
 
 import com.songoda.epicbosses.utils.IReplaceableConverter;
 import com.songoda.epicbosses.utils.StringUtils;
-import com.songoda.epicbosses.utils.factory.NbtFactory;
 import com.songoda.epicbosses.utils.itemstack.converters.EnchantConverter;
 import com.songoda.epicbosses.utils.itemstack.converters.MaterialConverter;
 import com.songoda.epicbosses.utils.itemstack.holder.ItemStackHolder;
@@ -170,11 +169,7 @@ public class ItemStackConverter implements IReplaceableConverter<ItemStackHolder
         }
 
         if(isGlowing != null && isGlowing) {
-            ItemStack craftStack = NbtFactory.getCraftItemStack(itemStack);
-            NbtFactory.NbtCompound compound = NbtFactory.fromItemTag(craftStack);
-
-            compound.put("ench", NbtFactory.createList());
-            return craftStack;
+            //TODO
         }
 
         if(amount != null && amount > 1) {
diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/utils/itemstack/ItemStackUtils.java b/plugin-modules/Core/src/com/songoda/epicbosses/utils/itemstack/ItemStackUtils.java
index 7142e79..bc59797 100644
--- a/plugin-modules/Core/src/com/songoda/epicbosses/utils/itemstack/ItemStackUtils.java
+++ b/plugin-modules/Core/src/com/songoda/epicbosses/utils/itemstack/ItemStackUtils.java
@@ -2,7 +2,7 @@ package com.songoda.epicbosses.utils.itemstack;
 
 import com.songoda.epicbosses.utils.NumberUtils;
 import com.songoda.epicbosses.utils.StringUtils;
-import com.songoda.epicbosses.utils.factory.NbtFactory;
+//import com.songoda.epicbosses.utils.factory.NbtFactory;
 import com.songoda.epicbosses.utils.itemstack.enchants.GlowEnchant;
 import com.songoda.epicbosses.utils.itemstack.holder.ItemStackHolder;
 import org.bukkit.ChatColor;
@@ -62,14 +62,16 @@ public class ItemStackUtils {
 
         if(compoundData == null || compoundData.isEmpty()) return cloneStack;
 
-        ItemStack craftStack = NbtFactory.getCraftItemStack(cloneStack);
-        NbtFactory.NbtCompound compound = NbtFactory.fromItemTag(craftStack);
-
-        for(String s : compoundData.keySet()) {
-            compound.put(s, compoundData.get(s));
-        }
-
-        return craftStack;
+//        TODO
+//        ItemStack craftStack = NbtFactory.getCraftItemStack(cloneStack);
+//        NbtFactory.NbtCompound compound = NbtFactory.fromItemTag(craftStack);
+//
+//        for(String s : compoundData.keySet()) {
+//            compound.put(s, compoundData.get(s));
+//        }
+//
+//        return craftStack;
+        return cloneStack;
     }
 
     public static ItemStack createItemStack(ConfigurationSection configurationSection) {
diff --git a/pom.xml b/pom.xml
index f5e7925..6b07e9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     </modules>
 
     <properties>
-        <plugin.version>maven-version-number-SNAPSHOT-U64</plugin.version>
+        <plugin.version>maven-version-number-SNAPSHOT-U65</plugin.version>
         <plugin.name>EpicBosses</plugin.name>
         <plugin.main>com.songoda.epicbosses.CustomBosses</plugin.main>
         <plugin.author>AMinecraftDev</plugin.author>