Fixed the issue with device route