Fixed $watch behavior to deal with Angular 1.3.2 breaking change