partial fix CRM-12065
Merge pull request #104 from dlobo/CRM-12065

partial fix CRM-12065