-- fix for CRM-12292
Merge pull request #506 from ravishnair/CRM-12292

-- fix for CRM-12292