Tweaked previous merge

ref #1119