Fix list watch issue