Fixed performance when state_aggregate is enabled.