Automatically correct for CD flow