1 files changed, 4 insertions, 3 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
index f96960883..55235b3c2 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
@@ -1682,8 +1682,8 @@ namespace Tango.MachineStudio.Technician.ViewModels
                         {
                             using (ObservablesContext db = ObservablesContext.CreateDefault())
                             {
-                                config = db.GetConfiguration(x => x.Guid == ApplicationManager.ConnectedMachine.Machine.ConfigurationGuid).Clone();
-                                hw = db.GetHardwareVersionByMachine(ApplicationManager.ConnectedMachine.Machine.Guid).Clone();
+                                config = db.Adapter.GetConfiguration(x => x.Guid == ApplicationManager.ConnectedMachine.Machine.ConfigurationGuid).Clone();
+                                hw = db.Adapter.GetHardwareVersionByMachine(ApplicationManager.ConnectedMachine.Machine.Guid).Clone();
                             }
                         });
 
@@ -1773,12 +1773,13 @@ namespace Tango.MachineStudio.Technician.ViewModels
             if (MachineOperator != null)
             {
                 ObservablesContext db = ObservablesContext.CreateDefault();
+                ObservablesContextAdapter adapter = new ObservablesContextAdapter(db);
 
                 HardwareVersion hw = null;
 
                 await Task.Factory.StartNew(() =>
                 {
-                    hw = db.GetHardwareVersionByMachine(ApplicationManager.ConnectedMachine.Machine.Guid);
+                    hw = adapter.GetHardwareVersionByMachine(ApplicationManager.ConnectedMachine.Machine.Guid);
                 });
 
                 foreach (var motorConfig in hw.HardwareMotors)