Actually fix group mechanic