Fixed a merge error introduced when adding the existing code base