fixed lack of break call
fixed groupId