Fixing server watch