fix CRM-12002
fix CRM-12002
Merge pull request #27 from dlobo/CRM-12002

Fix CRM-12002