NTI1650-1894

Enforced returns