CYE2525-2788

Enforced returns