diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
index 7bc23bd23cd1c0b7226d60f828db481b190d4381..459f77c942edc69b3c36a614cb30985618ef02b6 100755
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
@@ -1670,11 +1670,11 @@ public class DeviceManagerImpl implements IDeviceManagerService, IOFMessageListe
              * Also make sure the attachmentPoints are in non-blocked state
              */
             for (DeviceAttachmentPoint dap: tempAPMap.values()) {
-            	dap.resetConflictState();
+            	dap.setBlocked(false);
             }
             d.setAttachmentPoints(tempAPMap.values());
             for (DeviceAttachmentPoint dap : tempOldAPMap.values()) {
-                dap.resetConflictState();
+            	dap.setBlocked(false);
                 d.addOldAttachmentPoint(dap);
             }