Finally fixed daterange