Fixed the number of children and figure identifier...