implemented issue #137