Bug Fix 4138
Merge pull request #733 from scnakandala/master

Bug Fix 4138