HAM2936-4387

Enforced returns