fixed device.js after merge