NPY3522-3380

Enforced returns