CRM-13833 fix
Merge pull request #2474 from jitendrapurohit/CRM-13833

CRM-13833 fix