fixed watch code