Fix LP: #1168836
Add changelog entry
Merge pull request #99 from phanimahesh/fix-lp-1168836

Fix lp 1168836