Fix for accumulation option.

- temporary fix, need refactoring.