BEI2955-6491

Enforced returns