Fix until for watching overnight