infinite loop by watch task
Merge branch 'hotfix/1.0.1'

* hotfix/1.0.1:
  infinite loop by watch task