Fixed missing code after previous merge.