Fixed a faulty merge.