additional changes for issue #366
Merge pull request #368 from vz-risk/issue366

additional changes for issue #366