Switching to logic that copes if not on the IIPC fork