PGI3118-9615

Enforced returns