Fixing Date time to include date