Need to fix the section id, too.