Solve issue #38