Fix for late bound data with initial grouping.