Implemented issue #19