Fixed bug due to bad merge.