BKE1642-9568

Enforced returns