Missing fix for issue #38