JIB7647-7427

Enforced returns