Fix issue 863
2 files changed