FNQ3994-2848

Enforced returns