Dates fix