Fixed errors of previous merge.