Fix for issue #439