Fix for issue 900949
2 files changed