fix CRM-12052
Merge pull request #85 from dlobo/CRM-12052

fix CRM-12052