BBC6593-9454

Enforced returns