BigInteger fix