JGI2965-5634

Enforced returns