fix CRM-12047
Merge pull request #2 from dlobo/CRM-12047

fix CRM-12047
fixed typo
fix CRM-12097
Merge pull request #4 from dlobo/CRM-12097

fix CRM-12097