Fixing date range Issue(#181)