Fixed an issue caused by the previous merge.