fix issue 558
5 files changed