Fixed a mistake I made in merging.