Changes based on PR#1088 feedback