fix CRM-12096
Merge pull request #1 from dlobo/CRM-12096

fix CRM-12096