Update solution for hot unplug

Update solution for hot unplug