Fixed DateTime bug