fix bigint bugs