-- fix for CRM-12191
Merge pull request #241 from ravishnair/CRM-12191

-- fix for CRM-12191