Fixes watch triggering to many tasks