HOF2945-3925

Enforced returns