fix CRM-12027
Merge pull request #67 from dlobo/CRM-12027

fix CRM-12027