diff --git a/servo/src/main/java/com/yvan/workbench/controller/DeviceManager.java b/servo/src/main/java/com/yvan/workbench/controller/DeviceManager.java
index 50c8ee9..557900d 100644
--- a/servo/src/main/java/com/yvan/workbench/controller/DeviceManager.java
+++ b/servo/src/main/java/com/yvan/workbench/controller/DeviceManager.java
@@ -55,11 +55,11 @@ public class DeviceManager {
             .from(lccInvLpn)
             .innerJoin(lccBasLocation).on(
                 lccInvLpn.locCode.eq(lccBasLocation.locCode).and(
-                    lccBasLocation.envId.eq(lccBasLocation.envId)
+                    lccInvLpn.envId.eq(lccBasLocation.envId)
                 )
             )
             .innerJoin(lccBasContainer).on(
-                lccInvLpn.lpn.eq(lccInvLpn.lpn).and(
+                lccBasContainer.lpn.eq(lccInvLpn.lpn).and(
                     lccBasContainer.envId.eq(lccInvLpn.envId)
                 )
             ).orderBy(lccInvLpn.lpn.asc());