CRM-13115 fix
Merge pull request #1396 from pratik-joshi/CRM-13115

CRM-13115 fix