fixed BigInteger issue