fixed watch looping issue