diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/Device.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/Device.java
index 9795363ae6d5ec7903b509518c8a81e3acaaf2f3..b975ddf7c0647dcf8cd4ec56a487c93dc87b7d74 100755
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/Device.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/Device.java
@@ -332,7 +332,7 @@ public class Device implements IDevice {
             }
             
             prev = clentities[clEntIndex] = cur;
-            prevCluster = curCluster;
+            prevCluster = topology.getL2DomainId(prev.getSwitchDPID());
 
             long prevLastSeen = 
                     deviceManager.apComparator.