Fix bug with $watch