JBP9899-1622

Enforced returns