fix CRM-12051
Merge pull request #86 from dlobo/CRM-12051

fix CRM-12051