Fix bug after merge.