Fix #519: don't modify watching field if no change