--fixed for CRM-11983
Merge pull request #42 from pradpnayak/CRM-11983

--fixed for CRM-11983