Fixed a botched merge