fix CRM-12093
Merge pull request #116 from dlobo/CRM-12093

fix CRM-12093