Date fix by changing format