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

Fix CRM-12009