Fixed a forgotten merge