Fix Graham's shitty merge