fixup of o2corr logic