changes to fix issue 620
5 files changed