Correct period calculations to actually add-up