Fixed calculation for old accounts