Fix data calculations for values above 1000