[LANG] Patch attached for LANG-583 issue

[Chandra Shekar]

Hi

 I have attached the patch file for LANG-583 issue in jira, Please let me know 
if there are any issues.

Thanks
Chandrashekar