Fix date range again