fix CRM-12034
Merge pull request #64 from dlobo/CRM-12034

fix CRM-12034