Fixed calculation of client an team increments