Fixed bug after merge.