Additional fix after merge.