AOF6007-8896

Enforced returns