Fix watchlist bug