Fix year ordering