CRM-13311 additional fix
Merge pull request #66 from monishdeb/CRM-13311

CRM-13311 additional fix