Correct ordinals handling