Resolved DateTime bug