diff --git a/adapters/simulated_olt/adaptercore/device_handler.go b/adapters/simulated_olt/adaptercore/device_handler.go
index 0741761..3e2d01d 100644
--- a/adapters/simulated_olt/adaptercore/device_handler.go
+++ b/adapters/simulated_olt/adaptercore/device_handler.go
@@ -133,6 +133,9 @@
 	cloned.ConnectStatus = voltha.ConnectStatus_REACHABLE
 	cloned.OperStatus = voltha.OperStatus_ACTIVE
 
+	dh.device = cloned
+	//dh.device.SerialNumber = cloned.SerialNumber
+
 	//	Update the device state
 	if err := dh.coreProxy.DeviceStateUpdate(nil, cloned.Id, cloned.ConnectStatus, cloned.OperStatus); err != nil {
 		log.Errorw("error-creating-nni-port", log.Fields{"deviceId": device.Id, "error": err})
@@ -149,7 +152,6 @@
 			"simulated_onu",
 			initialUniPortNo+i)
 	}
-	dh.device = cloned
 }
 
 func (dh *DeviceHandler) GetOfpDeviceInfo(device *voltha.Device) (*ic.SwitchCapability, error) {