DYF2930-3129

Enforced returns