Fix for issue 13095
2 files changed