Fix derp caused by merge 2