Fixed bug caused by merging.