Watch task fix