OLF0682-5715

Enforced returns