Merge pull request #1194 from bradymiller/fix-issue-1176_1