Fix for issue r1737832
2 files changed