fix CRM-12074
Merge pull request #103 from dlobo/CRM-12074

fix CRM-12074