Fixes issue with devicetype mapping