-- fixed for CRM-12233
Merge pull request #294 from pradpnayak/CRM-12233

-- fixed for CRM-12233