fix CRM-12080
Merge pull request #107 from dlobo/CRM-12080

fix CRM-12080