Start & End date fix