DateTime bug fix