Implemented issue #2