BZ-13195 fixed double counting