Fix for BZ-1032722.
Merge pull request #363 from EricWittmann/BZ-1032722

Fix for BZ-1032722