fix up accumulation issues