fix bug caused by merging with branch bk_ideas