Fixed bug I had introduced in merge