Fix issue #8 where we carried forward excess amounts