Fix for bug26983
Merge pull request #37 from boblund/bug26893

Fix for bug26983