fix timming of watch event set