Fix issue #439