Second fix for issue #4373
2 files changed