fix group bugs