Fix for new group system