Fix issue #520
2 files changed