Fix issue I had with the merge