NOP2379-1375

Enforced returns