--fixed for CRM-12061
Merge pull request #133 from pradpnayak/CRM-12061

--fixed for CRM-12061