partial fix for issue 676
3 files changed