DateTime bug fixed