Fix empty node issue