CRM-13248 fix
Merge pull request #1537 from pratik-joshi/CRM-13248

CRM-13248 fix