Group Assignment bug fix