GVI5838-6034

Enforced returns