Fixed watchlist issue