OEI7080-1906

Enforced returns