Fix CRM-12382
Merge pull request #482 from colemanw/CRM-12382

Fix CRM-12382