fixed wrong calculate for older issues