Adding proposed fix to prevent irrelevant MCO rows due to BNI blowup.