CRM-13007 fix

CRM-13007 : as the description in issue, verified the given modification, working fine.