Empty node fix