diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll
index 7a48152b..547e2ffc 100644
Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ
diff --git a/Step.Config/ServerConfigController.cs b/Step.Config/ServerConfigController.cs
index 53386dc0..e90e8edb 100644
--- a/Step.Config/ServerConfigController.cs
+++ b/Step.Config/ServerConfigController.cs
@@ -279,7 +279,7 @@ namespace Step.Config
         {
             XDocument xmlConfigFile = GetXmlHandlerWithValidator(HEADS_CONFIG_SCHEMA_PATH, HEADS_CONFIG_PATH);
 
-            int i = 0;
+            int i = 1;
             // Read head config from XML file
             HeadsConfig = xmlConfigFile
                 .Root
diff --git a/Step.Model/DTOModels/DTOHeadModel.cs b/Step.Model/DTOModels/DTOHeadModel.cs
index 7b85e6e7..0f403dbc 100644
--- a/Step.Model/DTOModels/DTOHeadModel.cs
+++ b/Step.Model/DTOModels/DTOHeadModel.cs
@@ -100,7 +100,7 @@
 
         public override bool Equals(object obj)
         {
-            var item = obj as DTOAbrasiveWaterJet;
+            var item = obj as DTOWaterJet;
 
             // Object is not a DTOSpindleModel
             if (item == null)