Accordion: fixes #9264