Fix for issue1594
3 files changed