AMF8223-1596

Enforced returns