implemented issue #131