WIP: fix bug. However, tests are broken because children now differ