Fix watch list

Change-Id: I3e07d48f56fb29f0ac36fd7935c98af3576d8988