-- fixed for CRM-12333
Merge pull request #449 from pradpnayak/CRM-12333

-- fixed for CRM-12333