bug fix after merge.