Corrected a bug introduced by incorrect merge