--fixed for CRM-12018
Merge pull request #76 from pradpnayak/CRM-12018

--fixed for CRM-12018