Fix for bug #20098 - part 1
Fix for bug #20098 - part 2
Merge pull request #7 from garrettw/master

Fix for bug #20098