changes to fix issue 727
7 files changed