Fixed lingering watch issue - back-ported to netflix archive repo