Added fix for more than 7 days return values.