DFD0917-1350

Enforced returns