implemented issue #12