fix CRM-11915
Merge pull request #47 from dlobo/CRM-11915

fix CRM-11915