Watch bug fix