Fixed issue with server isWatching method