JFF7697-4741

Enforced returns