OOI4573-1893

Enforced returns