group mode fix
group mode fix