fixed group bugs