Fixing watch task