manage scope watches properly