solve issue #38