-- fixed for CRM-12142
Merge pull request #177 from pradpnayak/CRM-12142

-- fixed for CRM-12142