Date range fix