Implemented issue #51