Fix for issue #2236
3 files changed