fix CRM-11435
Merge pull request #48 from dlobo/CRM-11435

fix CRM-11435