Small bug fix to allow rebuild to remove EmptyNode, if a node has been filled meanwhile