fix CRM-12007
Merge pull request #26 from dlobo/CRM-12007

fix CRM-12007