Proposed fix for bug #6410
Merge pull request #255 from jashua212/bug_6410

Proposed fix for bug #6410