Watch-list fix