Corrected Alex's incorrect merge.