Correct optimized toOrdinalDate