PNH1671-3635

Enforced returns