fix for BZ 1032726
Merge pull request #364 from EricWittmann/BZ-1032726

fix for BZ 1032726