Fix for devices with spaces in their names
