fixing groups management