Fix bug associated with the branch merge