Foreach for watchers bug fixed