Merge pull request #1 from dlobo/CRM-12001

fix CRM-12001