Change watching to prevent error $digest() iterations reached