Fix for Issue#1165
Merge pull request #1166 from swapna-chennadi/master

Fix for Issue#1165