CRM-12571 fix
Merge pull request #703 from pratik-joshi/CRM-12571

CRM-12571 fix