Fix group troubles