need to correct bigint situation later