Fixing OverlayUnwatched case

Step 1
Fixing OverlayUnwatched case

Step 2