Gh 1158

checked locally and regression tested.  ready for merge.