Bug fix from merge.