fix CRM-12047
Merge pull request #2 from dlobo/CRM-12047

fix CRM-12047