closed issue #38