Expandable panels bug fix