fix bip/oip issue