Fix for device path issue