fix server watch problem