fixed
Merge branch 'refs/heads/hotfix-date-ordering'