fixed bug in token fwd aggregation