workaround issue #38