After apending two years performing this calculation, I can finally confirm: it is correct.