implemented issue #34