implemented issue #200