Hotfix dates incorrect ordering