fix CRM-12080
fix CRM-12079
Merge pull request #108 from dlobo/CRM-12079

fix CRM-12079
Merge pull request #107 from dlobo/CRM-12080

fix CRM-12080