Fixed the issue with device route
Fixed the issue with device route