tighten return codes