Bugfix: correctly aggregate the last tick