NXF2359-6987

Enforced returns