implemented issue #478