For #1950: use section name instead of section id