Alternative fix for the redefinition of watcher
Redefining name 'changed_by' from outer scope