JFX0824-1203

Enforced returns