Fix for workaround. I didn't take the unwatched-flag in consideration. (issue #571)