trying to track down device id bug
Fixed bug I just introduced