FIE1934-3946

Enforced returns