Hotfix/auto watch

Hotfix/auto watch