fix for BZ 1041338
fix for BZ 1041338
Merge pull request #129 from EricWittmann/master

Fix for BZ 1041338