implemented issue #33