Fixed group issues