Probable fix for issue #38