Fix for the PickWeek performance issue.