diff --git a/Step.Database/Controllers/NcToolManagerController.cs b/Step.Database/Controllers/NcToolManagerController.cs
index a032b3ba..f8c6e17b 100644
--- a/Step.Database/Controllers/NcToolManagerController.cs
+++ b/Step.Database/Controllers/NcToolManagerController.cs
@@ -231,7 +231,7 @@ namespace Step.Database.Controllers
         public List<DbNcToolModel> GetMountedTools()
         {
             List<DbNcToolModel> tools = FindToolsWithDependencies()
-                .Where(x => x.Shank.MagazineId != null)
+                .Where(x => x.Shank != null && x.Shank.MagazineId != null)
                 .ToList();
 
             return tools;
@@ -246,7 +246,7 @@ namespace Step.Database.Controllers
             return dtoShanks; 
         }
 
-        public List<DTONcShankModel> GetAvailableShanksWithoutChilds()
+        public List<DTONcShankModel> GetAvailableShanksWithChilds()
         {
             List<DTONcShankModel> dtoShanks = GetShanks()
                 .Where(x => x.MagazineId == null && x.ChildsTools.Count > 0)
diff --git a/Step/Controllers/WebApi/NcToolManagerController.cs b/Step/Controllers/WebApi/NcToolManagerController.cs
index ecf2abe8..477e411b 100644
--- a/Step/Controllers/WebApi/NcToolManagerController.cs
+++ b/Step/Controllers/WebApi/NcToolManagerController.cs
@@ -377,7 +377,7 @@ namespace Step.Controllers.WebApi
             }
         }
 
-        [Route("family/{familyId:int}"), HttpDelete]
+        [Route("family/{familyId:int}"), HttpDelete] 
         public IHttpActionResult DeleteFamily(int familyId)
         {
             using (NcToolManagerController toolsManager = new NcToolManagerController())
@@ -478,14 +478,8 @@ namespace Step.Controllers.WebApi
             using (NcToolManagerController toolsManager = new NcToolManagerController())
             {
                 List<DTONcShankModel> shanks = new List<DTONcShankModel>();
-                if (ToolManagerConfig.MultidimensionalShankOpt)
-                {
-                    shanks = toolsManager.GetAvailableShanks();
-                }
-                else
-                {
-                    shanks = toolsManager.GetAvailableShanksWithoutChilds();
-                }
+
+                shanks = toolsManager.GetAvailableShanksWithChilds();
 
                 return Ok(shanks);
             }