--fixed for CRM-11467
Merge pull request #41 from pradpnayak/CRM-11467

--fixed for CRM-11467