implemented issue #120