Fixed error introduced by merging.