diff --git a/InventoryKamera/data/DatabaseManager.cs b/InventoryKamera/data/DatabaseManager.cs
index 392b750..0575595 100644
--- a/InventoryKamera/data/DatabaseManager.cs
+++ b/InventoryKamera/data/DatabaseManager.cs
@@ -390,10 +390,11 @@ private UpdateStatus UpdateCharacters(bool force)
 
                                 foreach (var element in playerElements)
                                 {
-                                    var elementSkill = skills.FirstOrDefault(entry => entry["skillIcon"].ToString().Contains($"Player{element.Key}") && !entry.ContainsKey("costElemType"));
-                                    
-
-                                    if (elementSkill == null) continue;
+                                    var elementSkill = skills
+                                        .Where(entry => entry["skillIcon"].ToString().Contains($"Player{element.Key}"))
+                                        .FirstOrDefault(entry => !entry.ContainsKey("costElemType") || entry["costElemType"]?.ToString() is "None");
+                                    if (elementSkill == null) 
+                                        continue;
 
                                     skill = Mappings[elementSkill["nameTextMapHash"].ToString()].ToString();