Fixed faulty merge.