Watch position bug fix