Potential fix for bug 573.
Merge pull request #46 from mdeters/bug573

Potential fix for bug 573.