Work around for new AggregateBy behavior