Fix Date cast