Handle the fact that CVs can go one step too far with the main thread