fixed groupByJoin