Re #1580 - OOC/NC logic fix