fix for issue #732
5 files changed