implemented issue #469