Bugfix/416 possible watchers