JGE3586-1822

Enforced returns