Fix weird watching behavior.