Implemented issue #37