Fix for ghost nodes
invert if
Merge branch 'nulltokens'