fix CRM-12043
Merge pull request #87 from dlobo/CRM-12043

fix CRM-12043