Fix PanelGroup after upgrade of