Devices recognition fix