Minor bug fix after merge