XHC5518-5993

Enforced returns