implemented issue #181