Fixed WatchEndpoints