Fixing NodeEmpty not ending