bug fix after merge