finished small group bug fix