Fixed bug from merge.