Better logic for FORCE_FULL_IB