Fix issue due to new root node