Implemented issue #176