Fix Subdevice Id setting