Fix for issue #4458