issue #439