Fixed a merge gone bad!