Additional fix related to previous merge.