Bug fix

Fixed duplicate watchers issue