bug fix, deviceData change