Fix bug from merging