Fixed a missed merge