Implemented issue #38