Fix bug with broken group collapse/expand button