Fixing to level-2 issue, as well as issue of activating next section early