--fixed for CRM-12155
Merge pull request #242 from pradpnayak/CRM-12155

--fixed for CRM-12155