Second fix for TID and NID references.