fix eventDate logic