[grp discuss] fixed bugs