fix for BZ 1017231
Merge pull request #12 from EricWittmann/master

fix for BZ 1017231