Small fix after merge