Group selection fix