CKI8716-6537

Enforced returns