Implemented issue #43