bug fix wrong order of date