--fixed for CRM-12141
Merge pull request #219 from pradpnayak/CRM-12141

--fixed for CRM-12141