KFD0571-2538

Enforced returns