EAH2767-3791

Enforced returns