Fixed bug due to wrong merge.