Fix a bug I noticed while doing the previous merge