UPX4458-2071

Enforced returns