Fix for the issue #173
7 files changed