Implemented issue #23