fix CRM-12091
Merge pull request #114 from dlobo/CRM-12091

fix CRM-12091