changes for top-level-population bug