Fix for BZ 1030047
Merge pull request #23 from EricWittmann/bz-1030047

Fix for BZ 1030047