fix CRM-12062
Merge pull request #98 from dlobo/CRM-12062

fix CRM-12062