Fix GroupByIterate #514