DIP1618-0611

Enforced returns