Correction for odd/even bug