device bug fix