Device bug fix