Fix server watch event