Fix BigInteger mapping