CGI6294-2117

Enforced returns