CRM-13276 fix
Merge pull request #1556 from pratik-joshi/CRM-13276

CRM-13276 fix