Fix: need not cumulate further than the last state