fixed date logic for batching