Fixed empty nodes