CRM-15557 fix
Merge pull request #4763 from jitendrapurohit/CRM-15557-Fix

CRM-15557 fix