Fixes issue #439