Fix issue #2015
4 files changed