Fix additional values being accumulated