Fix bug after merge