fixed date collection issues